From 1ab51601d973e06ccfe859f8ff48f63b7e2c696d Mon Sep 17 00:00:00 2001 From: sparkyx Date: Fri, 1 Oct 2021 13:22:37 +0200 Subject: [PATCH] Bug rounded : show amount in currency with 4 dec. --- include/class/print_operation_currency.class.php | 4 ++-- include/template/ledger_detail_ach.php | 6 +++--- include/template/ledger_detail_ven.php | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/class/print_operation_currency.class.php b/include/class/print_operation_currency.class.php index cbf3ce35b..bc4c40d12 100644 --- a/include/class/print_operation_currency.class.php +++ b/include/class/print_operation_currency.class.php @@ -154,7 +154,7 @@ EOF; $r.=td(nbm($aData[$i]['j_montant'],2),'class="num"'); $r.=td(round($aData[$i]['currency_rate'],4),'class="num"'); $r.=td(round($aData[$i]['currency_rate_ref'],4),'class="num"'); - $r.=td(nbm($aData[$i]['oc_amount'],2),'class="num"'); + $r.=td(nbm($aData[$i]['oc_amount'],4),'class="num"'); $r.=""; } $r.=""; @@ -204,7 +204,7 @@ EOF; $export->add(nbm($aData[$i]['j_montant'],2),"number"); $export->add(round($aData[$i]['currency_rate'],4),"number"); $export->add(round($aData[$i]['currency_rate_ref'],4),"number"); - $export->add(nbm($aData[$i]['oc_amount'],2),"number"); + $export->add(nbm($aData[$i]['oc_amount'],4),"number"); $export->write(); } } diff --git a/include/template/ledger_detail_ach.php b/include/template/ledger_detail_ach.php index f5315e1a8..764b37dab 100644 --- a/include/template/ledger_detail_ach.php +++ b/include/template/ledger_detail_ach.php @@ -251,8 +251,8 @@ $str_anc=""; */ if ( $obj->det->currency_id != 0 ) { $value=$obj->db->get_value("select oc_amount+oc_vat_amount from operation_currency where j_id=$1",[$q['j_id']]); - $row.=td(nbm($value,2),' class="num"'); - $sum_charge_euro=bcadd($sum_charge_euro,$value,2); + $row.=td(nbm($value,4),' class="num"'); + $sum_charge_euro=bcadd($sum_charge_euro,$value,4); } echo tr($row,$class); @@ -269,7 +269,7 @@ $str_anc=""; if ( $obj->det->currency_id != "" && $obj->det->currency_id > 0) { $currency=new Acc_Currency($obj->db, $obj->det->currency_id); - $row.= td(nbm($sum_charge_euro),' class="num" style="font-style:italic;font-weight: bolder;"'); + $row.= td(nbm($sum_charge_euro,4),' class="num" style="font-style:italic;font-weight: bolder;"'); } echo tr($row); diff --git a/include/template/ledger_detail_ven.php b/include/template/ledger_detail_ven.php index a8a8b4494..90907c2b1 100644 --- a/include/template/ledger_detail_ven.php +++ b/include/template/ledger_detail_ven.php @@ -256,8 +256,8 @@ echo $ipaid->input(); */ if ( $obj->det->currency_id != 0 ) { $value=$obj->db->get_value("select oc_amount+oc_vat_amount from operation_currency where j_id=$1",[$q['j_id']]); - $sum_prod_currency=bcadd($sum_prod_currency,$value,2); - $row.=td(nbm($value,2),' class="num"'); + $sum_prod_currency=bcadd($sum_prod_currency,$value,4); + $row.=td(nbm(round($value,4),4),' class="num"'); } echo tr($row,$class); @@ -274,7 +274,7 @@ echo $ipaid->input(); //Display total in currency if ( $obj->det->currency_id != "" && $obj->det->currency_id > 0) { - $row.= td(nbm($sum_prod_currency,2),' class="num" style="font-style:italic;font-weight: bolder;"'); + $row.= td(nbm($sum_prod_currency,4),' class="num" style="font-style:italic;font-weight: bolder;"'); } echo tr($row); ?>