[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 03/04: Sold : correct amount in summary
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 03/04: Sold : correct amount in summary |
Date: |
Sun, 30 Nov 2014 22:47:28 +0000 |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 2d51f52da1162d5d2fbdc5ca90525a147e9580d1
Author: Dany De Bontridder <address@hidden>
Date: Sun Nov 30 23:26:10 2014 +0100
Sold : correct amount in summary
---
include/class_acc_ledger_sold.php | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/class_acc_ledger_sold.php
b/include/class_acc_ledger_sold.php
index 1c5a44b..f7263a0 100644
--- a/include/class_acc_ledger_sold.php
+++ b/include/class_acc_ledger_sold.php
@@ -818,7 +818,7 @@ class Acc_Ledger_Sold extends Acc_Ledger {
{$tot_amount}
</td>
<td class="num">
- {$tot_amount}
+ {$tot}
</td>
EOF;
@@ -833,7 +833,7 @@ EOF;
if ($g_parameter->MY_TVA_USE == 'Y') {
$r.='<table>';
$r.='<tr><td>Total HTVA</td>';
- $r.=td(hb(nbm($tot_amount) ),'class="num"');
+ $r.=td(hb($tot_amount ),'class="num"');
foreach ($tva as $i => $value) {
$oTva->set_parameter('id', $i);
$oTva->load();
@@ -841,8 +841,8 @@ EOF;
$r.='<tr><td> TVA ' . $oTva->get_parameter('label').'</td>';
$r.=td(hb(nbm($tva[$i])),'class="num"');
}
- $r.='<tr>'.td(_('Total TVA')).td(hb(nbm($tot_tva)),'class="num"');
- $r.='<tr>'.td(_('Total TVAC')).td(hb(nbm($tot)),'class="num"');
+ $r.='<tr>'.td(_('Total TVA')).td(hb($tot_tva),'class="num"');
+ $r.='<tr>'.td(_('Total TVAC')).td(hb($tot),'class="num"');
$r.='</table>';
} else {
$r.='<br>Total '.hb(nbm($tot));
- [Noalyss-commit] [noalyss] branch master updated (2244925 -> b0954f8), Dany De Bontridder, 2014/11/30
- [Noalyss-commit] [noalyss] 01/04: Invoicing bug : the first invoice is properly but not the others, the problem comes from the static, even in a new object, the static of a function remains with the value of the other object, Dany De Bontridder, 2014/11/30
- [Noalyss-commit] [noalyss] 03/04: Sold : correct amount in summary,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 04/04: Task #1045 - Amélioration apparence : Amélioration thème light Correct bug dans Acc_Ledger_Purchase, résumé des totaux, Dany De Bontridder, 2014/11/30
- [Noalyss-commit] [noalyss] 02/04: print font too large, Dany De Bontridder, 2014/11/30