[Noalyss-commit] [noalyss] 08/11: Task #1061 - Détail TVA autoliquidation

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 0041a0b157d8f7725dd4eaa7ed4dc053b79cd0dc
Author: Dany De Bontridder <address@hidden>
Date:   Wed Dec 3 21:21:57 2014 +0100

    Task #1061 - Détail TVA autoliquidation
---
 include/template/ledger_detail_ach.php |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/include/template/ledger_detail_ach.php 
b/include/template/ledger_detail_ach.php
index c1e74e2..d513aa2 100644
--- a/include/template/ledger_detail_ach.php
+++ b/include/template/ledger_detail_ach.php
@@ -195,7 +195,7 @@ $str_anc="";
                     $tvac = bcadd($htva, $q['qp_vat']);
                     $tvac = bcadd($tvac, $q['qp_nd_tva']);
                     $tvac = bcadd($tvac, $q['qp_nd_tva_recup']);
-
+                    $tvac = bcsub ($tvac,$q['qp_vat_sided']);
 
                     if ($owner->MY_TVA_USE == 'Y')
                     {
@@ -204,14 +204,13 @@ $str_anc="";
                         if ($q['qp_vat_sided'] <> 0)
                         {
                             $class = ' style="text-decoration:line-through"';
-                            $tvac = bcsub($tvac, $q['qp_vat']);
                         }
                         $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;
-                    $total_htva+=$htva;
+                    $total_tvac=bcadd($total_tvac,$tvac);
+                    $total_htva=bcadd($htva,$total_htva);
                     /* Analytic accountancy */
                     if ($owner->MY_ANALYTIC != "nu" /*&& $div == 'popup'*/ )
                     {