[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 06/33: Bug rounded : show amount in currency
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 06/33: Bug rounded : show amount in currency with 4 dec. |
Date: |
Thu, 11 Nov 2021 06:02:43 -0500 (EST) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 1ab51601d973e06ccfe859f8ff48f63b7e2c696d
Author: sparkyx <danydb@noalyss.eu>
AuthorDate: Fri Oct 1 13:22:37 2021 +0200
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 cbf3ce3..bc4c40d 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.="</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();
}
}
diff --git a/include/template/ledger_detail_ach.php
b/include/template/ledger_detail_ach.php
index f5315e1..764b37d 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 a8a8b44..90907c2 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);
?>
- [Noalyss-commit] [noalyss] branch master updated (8b28b18 -> 2b1bcd5), Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 04/33: Sale & Purchase Quantity with 2 dec., Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 01/33: Cosmetic : move dialog horizontally and vertically, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 02/33: Cosmetic : add button close for filter, dialog box search operation, TVA, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 09/33: Rounded for currency, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 08/33: Operation details : calcul correctement la différence avec les opérations extournées, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 12/33: Button close for new card, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 06/33: Bug rounded : show amount in currency with 4 dec.,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 10/33: For Misc Operation in currency , show the currency amount / row, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 11/33: Bug for reversed operation when currency are used, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 03/33: Improve HttpInput::extract , the array is set and not passed anymore, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 05/33: Bug : pour non-assujetti , pas de calcul en devise, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 07/33: Bug for reversed operation when currency are used, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 14/33: Typo, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 13/33: Compute.php it happens that the argument are not numeric, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 16/33: Documentation, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 15/33: Bug #2079 : 0002079: Recherche de carte : guillement ne passe pas, Dany De Bontridder, 2021/11/11
- [Noalyss-commit] [noalyss] 21/33: Cosmetic #2082 : OD parfois ajout différence de change, Dany De Bontridder, 2021/11/11