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

Bug rounded : show amount in currency with 4 dec.

Browse source
This commit is contained in:
sparkyx 2021-10-01 13:22:37 +02:00
parent d699d6409d
commit 1ab51601d9
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/class/print_operation_currency.class.php
View file

@ -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.="</tr>";
}
$r.="</table>";
@ -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();
}
}

6
include/template/ledger_detail_ach.php
View file

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

6
include/template/ledger_detail_ven.php
View file

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