[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 150/238: Currency : detail operation Sale , t
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 150/238: Currency : detail operation Sale , the amount in currency were wrong in the summary |
Date: |
Sat, 26 Oct 2019 04:40:54 -0400 (EDT) |
sparkyx pushed a commit to annotated tag rel7110
in repository noalyss.
commit 0395ed1d66431f239836acefa49b562776a851a1
Author: Dany De Bontridder <address@hidden>
Date: Sun Jan 6 21:10:43 2019 +0100
Currency : detail operation Sale , the amount in currency were wrong
in the summary
---
include/template/ledger_detail_ven.php | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/include/template/ledger_detail_ven.php
b/include/template/ledger_detail_ven.php
index 6ff9719..fb37c8e 100644
--- a/include/template/ledger_detail_ven.php
+++ b/include/template/ledger_detail_ven.php
@@ -122,6 +122,7 @@ echo $ipaid->input();
bcscale(2);
$total_htva = 0;
$total_tvac = 0;
+ $sum_prod_currency=0;
echo th(_('Quick Code'));
echo th(_('Description'));
echo th(_('Prix/Un'), 'style="text-align:right"');
@@ -256,7 +257,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']]);
- $row.=td(nbm($value,4),' class="num"');
+ $sum_prod_currency=bcadd($sum_prod_currency,$value,2);
+ $row.=td(nbm($value,2),' class="num"');
}
echo tr($row,$class);
@@ -273,8 +275,7 @@ echo $ipaid->input();
//Display total in currency
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_prod_currency,2),' class="num"
style="font-style:italic;font-weight: bolder;"');
}
echo tr($row);
?>
@@ -298,7 +299,7 @@ echo $ipaid->input();
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"), " ",$sum_prod_currency,$four_space;
}
?>
<?php
- [Noalyss-commit] [noalyss] 137/238: Translation, (continued)
- [Noalyss-commit] [noalyss] 137/238: Translation, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 141/238: Currency : for misc. operation, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 164/238: Currency Show currency info for MISC, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 161/238: PHP 7.2 incomptability : sizeof of not array, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 166/238: Typo, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 154/238: by default jrn is an empty array, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 149/238: Currency : purchase, save all detail also in currency, fix problem with the advance payment, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 160/238: Protect parameters, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 157/238: Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 162/238: Currency - fix view, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 150/238: Currency : detail operation Sale , the amount in currency were wrong in the summary,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 165/238: Database upgrade, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 158/238: Merge branch 'master' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 167/238: Currency : set default accounting for change difference when using currency, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 159/238: Currency : because of Misc Operation, the tiers must also be saved into operation_currency. Fix also PRINTJRN for currency, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 173/238: Mantis #0001682: CA - ajouter possibilité d'exporter le plan analytique, missing file, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 177/238: Mantis #1643: Déplacement du "bouton" «retour en-haut/calculatrice», Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 182/238: Bug : CARD misplace of "Search Card", Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 188/238: Fix broken merge, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 189/238: Fiche.clasS.php fix broken merge, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 191/238: Cosmetic adapt color, Dany De Bontridder, 2019/10/26