admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Currency : fix rounded bugs in detail operation

Browse source
This commit is contained in:
Dany De Bontridder 2018-05-10 09:41:28 +02:00
parent d6d0b3fa30
commit bec19964e8
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/template/ledger_detail_ach.php
View file

@ -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);

7
include/template/ledger_detail_ven.php
View file

@ -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);