[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 169/238: Mantis #0001688: Affichage centime
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 169/238: Mantis #0001688: Affichage centime dans l'écran de confirmation |
Date: |
Sat, 26 Oct 2019 04:40:58 -0400 (EDT) |
sparkyx pushed a commit to annotated tag rel7110
in repository noalyss.
commit 5f55c2731c9ee8b6e0e9912d9ef68806b7935b40
Author: Dany De Bontridder <address@hidden>
Date: Wed Jan 23 21:03:55 2019 +0100
Mantis #0001688: Affichage centime dans l'écran de confirmation
---
include/class/acc_ledger_fin.class.php | 52 +++++++++++++++++++++++++++-------
1 file changed, 41 insertions(+), 11 deletions(-)
diff --git a/include/class/acc_ledger_fin.class.php
b/include/class/acc_ledger_fin.class.php
index df743a4..f07d5ce 100644
--- a/include/class/acc_ledger_fin.class.php
+++ b/include/class/acc_ledger_fin.class.php
@@ -639,24 +639,54 @@ class Acc_Ledger_Fin extends Acc_Ledger
$cur_rate=$acc_currency->get_rate_date($e_date);
$default_currency=new Acc_Currency($this->db , 0);
// saldo
-
- $r.='<br>'.sprintf(_("Ancien solde = %f %s"),$solde,
$cur);
+ $r .= "<table>";
+ $r .= tr(
+ td(_("Ancien solde")) .
+ td(nbm($solde).$cur, 'class="num"')
+ );
$new_solde=bcadd($solde,$tot_amount);
- $r.='<br>'.sprintf(_("Nouveau solde = %f %s"),$new_solde,
$cur);
- $r.='<br>'.sprintf(_("Difference = %f %s"), $tot_amount,
$cur);
+ $r .= tr(
+ td(_("Nouveau solde")) .
+ td(nbm($new_solde).$cur, ' class="num"')
+ );
+ $r .= tr(
+ td(_("Difference")) .
+ td(nbm($tot_amount).$cur, ' class="num"')
+ );
+ $r.=tr(
+ td(_("Taux")).
+ td($cur_rate)
+ );
+ $r.=tr(
+ td(_("Nouveau solde")).
+
td(bcdiv($new_solde,$cur_rate).$default_currency->get_code(), ' class="num"')
+ );
+ $r.='</table>';
+
- $r.='<br>'.sprintf(_("Taux = %s"),$cur_rate);
- $r.='<br>'.sprintf(_("Nouveau solde = %f
%s"),bcdiv($new_solde,$cur_rate),$default_currency->get_code());
+
} else {
$cur=$acc_currency->get_code();
// saldo
-
- $r.='<br>'.sprintf(_("Ancien solde = %f %s"),$solde,
$cur);
- $new_solde=bcadd($new_solde,$tot_amount);
- $r.='<br>'.sprintf(_("Nouveau solde = %f %s"),$new_solde,
$cur);
- $r.='<br>'.sprintf(_("Difference = %f %s"), $tot_amount,
$cur);
+ $r .= "<table>";
+ $r .= tr(
+ td(_("Ancien solde")) .
+ td(nbm($solde).$cur, 'class="num"')
+ );
+ $new_solde=bcadd($solde,$tot_amount);
+ $r .= tr(
+ td(_("Nouveau solde")) .
+ td(nbm($new_solde).$cur, ' class="num"')
+ );
+ $r .= tr(
+ td(_("Difference")) .
+ td(nbm($tot_amount).$cur, ' class="num"')
+ );
+
+ $r.='</table>';
+
}
// check for upload piece
- [Noalyss-commit] [noalyss] 133/238: Translation, (continued)
- [Noalyss-commit] [noalyss] 133/238: Translation, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 142/238: Currency : Precision 6, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 156/238: Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 143/238: Currency : precision 6, display default currency , protect used currency against delete, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 134/238: use of httpInput, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 135/238: Translation, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 151/238: Task #1660 : place the button for the inventory on the top, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 155/238: Task #0001309: Association d'une opération avec elle-même., Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 163/238: PHP 7.2 mistyped command, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 171/238: Mantis #0001666: Export CSV depuis histo ne filtre pas par journal, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 169/238: Mantis #0001688: Affichage centime dans l'écran de confirmation,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 184/238: CSS : cosmetic, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 172/238: Mantis #0001682: CA - ajouter possibilité d'exporter le plan analytique, add action CSV:Analytic_Axis, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 186/238: Fix Inappropriate merge, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 194/238: TEST : fix some little bugs, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 187/238: Wrong merge broke fiche.class.php, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 178/238: Mantis #1665: Pouvoir modifier l'ordre dans les listing de compta analytique, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 183/238: Fix bug from merge, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 181/238: Mantis #1611: Problème Plan comptable - mise en évidence poste utilisés, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 185/238: Merge issue : inappropriate rollback, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 198/238: Merge branch 'entreprise' of gitlab.noalyss.eu:noalyss/noalyss into entreprise, Dany De Bontridder, 2019/10/26