[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 147/238: Currency : detail operation Purchase
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 147/238: Currency : detail operation Purchase , 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 4e1d598870ae68b4650363e1b8b0098b6cc4f291
Author: Dany De Bontridder <address@hidden>
Date: 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] 210/238: Improve apparence, (continued)
- [Noalyss-commit] [noalyss] 210/238: Improve apparence, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 237/238: Acc_Ledger : problem with acc_ledger::load(), Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 229/238: Task #1759 = PRINTBAL sur 4 colonnes, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 224/238: Improve PHPUNIT Test for phpunit7 and phpunit8, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 91/238: PHP 7.2 : fix incomptability, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 117/238: Currency : cosmetic display history : show only the value of the card/accounting, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 138/238: Translation, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 122/238: Currency : display correctly the saldo at the end / beginning operation, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 130/238: typo doc, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 123/238: Currency = payment automatic for Sales and Purchases, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 147/238: Currency : detail operation Purchase , the amount in currency were wrong in the summary,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 152/238: New function findSide return D if number is <0, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 168/238: translation, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 174/238: Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 193/238: Php7.2 incompatibility, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 176/238: Mantis #1626: AFFICHAGE BALANCE FICHE - soldes nuls au débit, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 192/238: Mantis #0001618: Journaux - choix du type en premier, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 195/238: mantis #1690: Bug : impossible d'utiliser < dans Inplace_Edit Replace strip_tags , add a space before the "<", Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 228/238: Bug with p_jrn, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 223/238: Task #0001703: Faciliter effacement montants dans les filtres, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 234/238: fixup! Printtva , under some circumstance tva_summary::check fails, Dany De Bontridder, 2019/10/26