[Noalyss-commit] [noalyss] 17/162: Currency : fix rounded bugs in detail operation

[Dany De Bontridder]

sparkyx pushed a commit to annotated tag E-4
in repository noalyss.

commit bec19964e8d053e5b3f3c60657c004d448df63de
Author: Dany De Bontridder <danydb@noalyss.eu>
AuthorDate: Thu May 10 09:41:28 2018 +0200

    Currency : fix rounded bugs in detail operation
---
 include/template/ledger_detail_ach.php | 6 +++---
 include/template/ledger_detail_ven.php | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/include/template/ledger_detail_ach.php 
b/include/template/ledger_detail_ach.php
index 97981af..67ef4bf 100644
--- a/include/template/ledger_detail_ach.php
+++ b/include/template/ledger_detail_ach.php
@@ -202,11 +202,11 @@ $str_anc="";
 
 
                     $row.=td(nbm($htva), 'class="num"');
-                    $tvac = bcadd($htva, $q['qp_vat']);
+                    $tva_rounded=round($q['qp_vat'],2);
+                    $tvac = bcadd($htva, $tva_rounded);
                     $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')
                     {
                         $tva_amount_nd = bcadd($q['qp_nd_tva_recup'], 
$q['qp_nd_tva']);
@@ -216,7 +216,7 @@ $str_anc="";
                             $class = ' style="text-decoration:line-through"';
                         }
                         $row.=td(nbm($tva_amount_nd), 'class="num" ' . $class);
-                        $row.=td(nbm($q['qp_vat']), 'class="num" ' . $class);
+                        $row.=td(nbm($tva_rounded), 'class="num" ' . $class);
                         $row.=td(nbm($tvac), 'class="num"');
                     }
                     $total_tvac=bcadd($total_tvac,$tvac);
diff --git a/include/template/ledger_detail_ven.php 
b/include/template/ledger_detail_ven.php
index fa7c3ac..26047ac 100644
--- a/include/template/ledger_detail_ven.php
+++ b/include/template/ledger_detail_ven.php
@@ -205,16 +205,17 @@ echo $ipaid->input();
                     $htva = $q['qs_price'];
 
                     $row.=td(nbm($htva), 'class="num"');
-                    $tvac = bcadd($htva, $q['qs_vat']);
+                    $tva_rounded=round($q['qs_vat'],2);
+                    $tvac = bcadd($htva, $tva_rounded);
                     if ($owner->MY_TVA_USE == 'Y')
                     {
                         $class = "";
                         if ($q['qs_vat_sided'] != 0)
                         {
                             $class = ' style="text-decoration:line-through"';
-                            $tvac = bcsub($tvac, $q['qs_vat']);
+                            $tvac = bcsub($tvac, $tva_rounded);
                         }
-                        $row.=td(nbm($q['qs_vat']), 'class="num"' . $class);
+                        $row.=td(nbm($tva_rounded), 'class="num"' . $class);
                         $row.=td(nbm($tvac), 'class="num"');
                     }
                     $total_tvac = bcadd($total_tvac, $tvac);