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

[phpcompta-dev]

Author: danydb
Date: 2014-01-07 21:22:48 +0100 (Tue, 07 Jan 2014)
New Revision: 5649

Modified:
   phpcompta/tags/rel671/include/template/ledger_detail_ach.php
Log:
show TVA ND

Modified: phpcompta/tags/rel671/include/template/ledger_detail_ach.php
===================================================================
--- phpcompta/tags/rel671/include/template/ledger_detail_ach.php        
2014-01-07 17:44:04 UTC (rev 5648)
+++ phpcompta/tags/rel671/include/template/ledger_detail_ach.php        
2014-01-07 20:22:48 UTC (rev 5649)
@@ -128,6 +128,7 @@
                 if ($owner->MY_TVA_USE == 'Y')
                 {
                     echo th(_('HTVA'), 'style="text-align:right"');
+                    echo th(_('TVA ND'), 'style="text-align:right"');
                     echo th(_('TVA'), 'style="text-align:right"');
                     echo th(_('TVAC'), 'style="text-align:right"');
                 } else
@@ -194,15 +195,15 @@
 
                     if ($owner->MY_TVA_USE == 'Y')
                     {
-                        $tva_amount = bcadd($q['qp_vat'], $q['qp_nd_tva']);
-                        $tva_amount = bcadd($tva_amount, 
$q['qp_nd_tva_recup']);
+                        $tva_amount_nd = bcadd($q['qp_nd_tva_recup'], 
$q['qp_nd_tva']);
                         $class = "";
                         if ($q['qp_vat_sided'] <> 0)
                         {
                             $class = ' style="text-decoration:line-through"';
                             $tvac = bcsub($tvac, $q['qp_vat']);
                         }
-                        $row.=td(nbm($tva_amount), 'class="num" ' . $class);
+                        $row.=td(nbm($tva_amount_nd), 'class="num" ' . $class);
+                        $row.=td(nbm($q['qp_vat']), 'class="num" ' . $class);
                         $row.=td(nbm($tvac), 'class="num"');
                     }
                     $total_tvac+=$tvac;
@@ -233,7 +234,7 @@
                     $row = td(_('Total'), ' 
style="font-style:italic;text-align:right;font-weight: bolder;width:auto" 
colspan="6"');
                 $row.=td(nbm($total_htva), 'class="num" 
style="font-style:italic;font-weight: bolder;"');
                 if ($owner->MY_TVA_USE == 'Y')
-                    $row.=td("") . td(nbm($total_tvac), 'class="num" 
style="font-style:italic;font-weight: bolder;"');
+                    $row.=td("") . td("").td(nbm($total_tvac), 'class="num" 
style="font-style:italic;font-weight: bolder;"');
                 echo tr($row);
                 ?>
             </table>
@@ -286,8 +287,7 @@
                         } else
                             $view_history = '';
                         $row.=td($view_history);
-                        /* $row=td($q[$e]['j_poste']); */
-                        /* $row.=td($q[$e]['j_qcode']); */
+                        
                         if ($q[$e]['j_text']=="")
                         {
                             if ($q[$e]['j_qcode'] != '')



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