[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 27/173: Currency : detail operation Purchase
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 27/173: Currency : detail operation Purchase , the amount in currency were wrong in the summary |
Date: |
Mon, 22 Mar 2021 12:58:29 -0400 (EDT) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 4e1d598870ae68b4650363e1b8b0098b6cc4f291
Author: Dany De Bontridder <danydb@noalyss.eu>
AuthorDate: Sun Jan 6 13:09:29 2019 +0100
Currency : detail operation Purchase , the amount in currency were wrong
in the summary
---
include/template/ledger_detail_ach.php | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/include/template/ledger_detail_ach.php
b/include/template/ledger_detail_ach.php
index 176c571..1cf72cf 100644
--- a/include/template/ledger_detail_ach.php
+++ b/include/template/ledger_detail_ach.php
@@ -164,6 +164,7 @@ $str_anc="";
}
echo '</tr>';
+ $sum_charge_euro=0;
for ($e = 0; $e < count($obj->det->array); $e++)
{
$row = '';
@@ -251,7 +252,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,4),' class="num"');
+ $row.=td(nbm($value,2),' class="num"');
+ $sum_charge_euro=bcadd($sum_charge_euro,$value,2);
}
echo tr($row,$class);
@@ -268,7 +270,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($currency->sum_amount($obj->jr_id),4),'
class="num" style="font-style:italic;font-weight: bolder;"');
+ $row.= td(nbm($sum_charge_euro),' class="num"
style="font-style:italic;font-weight: bolder;"');
}
echo tr($row);
@@ -287,7 +289,7 @@ $str_anc="";
echo $currency->get_code(),$four_space;
echo _("Taux utilisé")," ", $obj->det->currency_rate,$four_space;
echo _("Taux Réf"), " ",$obj->det->currency_rate_ref.$four_space;
- echo _("Montant en devise"),
" ",$currency->sum_amount($obj->jr_id).$four_space;
+ echo _("Montant en devise"),
" ",nbm($sum_charge_euro).$four_space;
}
?>
- [Noalyss-commit] [noalyss] 88/173: Merge branch 'dev7109' into entreprise, (continued)
- [Noalyss-commit] [noalyss] 88/173: Merge branch 'dev7109' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 26/173: Currency : history for accounting , correct amount in currency, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 28/173: remove commented code, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 34/173: by default jrn is an empty array, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 40/173: Protect parameters, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 43/173: PHP 7.2 mistyped command, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 47/173: Currency : set default accounting for change difference when using currency, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 16/173: Translation, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 17/173: Translation, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 23/173: Currency : precision 6, display default currency , protect used currency against delete, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 27/173: Currency : detail operation Purchase , the amount in currency were wrong in the summary,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 37/173: Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 38/173: Merge branch 'master' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 39/173: Currency : because of Misc Operation, the tiers must also be saved into operation_currency. Fix also PRINTJRN for currency, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 44/173: Currency Show currency info for MISC, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 46/173: Typo, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 48/173: translation, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 49/173: Mantis #0001688: Affichage centime dans l'écran de confirmation, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 50/173: Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 51/173: Mantis #0001666: Export CSV depuis histo ne filtre pas par journal, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 54/173: Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, Dany De Bontridder, 2021/03/22