[Phpcompta-dev] r5647 - phpcompta/tags/rel671/include/template

[phpcompta-dev]

Author: danydb
Date: 2014-01-07 18:16:00 +0100 (Tue, 07 Jan 2014)
New Revision: 5647

Modified:
   phpcompta/tags/rel671/include/template/ledger_detail_ach.php
Log:
Add label for ND row
Task #960 - TVA ND & comptabilit?\195?\169 analytique

Modified: phpcompta/tags/rel671/include/template/ledger_detail_ach.php
===================================================================
--- phpcompta/tags/rel671/include/template/ledger_detail_ach.php        
2014-01-07 17:01:31 UTC (rev 5646)
+++ phpcompta/tags/rel671/include/template/ledger_detail_ach.php        
2014-01-07 17:16:00 UTC (rev 5647)
@@ -288,18 +288,24 @@
                         $row.=td($view_history);
                         /* $row=td($q[$e]['j_poste']); */
                         /* $row.=td($q[$e]['j_qcode']); */
-                        if ($q[$e]['j_qcode'] != '')
+                        if ($q[$e]['j_text']=="")
                         {
+                            if ($q[$e]['j_qcode'] != '')
+                            {
                             // nom de la fiche
-                            $ff = new Fiche($cn);
-                            $ff->get_by_qcode($q[$e]['j_qcode']);
-                            $row.=td($ff->strAttribut(h(ATTR_DEF_NAME)));
-                        } else
-                        {
-                            // libellé du compte
-                            $name = $cn->get_value('select pcm_lib from 
tmp_pcmn where pcm_val=$1', array($q[$e]['j_poste']));
-                            $row.=td(h($name));
+                                $ff = new Fiche($cn);
+                                $ff->get_by_qcode($q[$e]['j_qcode']);
+                                $row.=td($ff->strAttribut(h(ATTR_DEF_NAME)));
+                            } else
+                            {
+                                // libellé du compte
+                                $name = $cn->get_value('select pcm_lib from 
tmp_pcmn where pcm_val=$1', array($q[$e]['j_poste']));
+                                $row.=td(h($name));
+                            }
                         }
+                        else 
+                            $row.=td(h($q[$e]['j_text']));
+                        
                         $montant = td(nbm($q[$e]['j_montant']), 'class="num"');
                         $row.=($q[$e]['j_debit'] == 't') ? $montant : td('');
                         $row.=($q[$e]['j_debit'] == 'f') ? $montant : td('');



---
PhpCompta est un logiciel de comptabilité libre en ligne (full web)
Projet opensource http://www.phpcompta.eu