From 4c0b0ef4c2b37f106d0017d3fbd21258fcaea2c5 Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Tue, 13 Jun 2017 11:29:12 +0200
Subject: [PATCH] Fix display on situation invoice
---
htdocs/compta/facture.php | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index c19c521ca65..59e52ac7b5d 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -3327,7 +3327,7 @@ else if ($id > 0 || ! empty($ref))
print $object->situation_counter;
print '</td>';
- print '<td align="right" class="nowrap">';
+ print '<td align="left" class="nowrap">';
$prevsits_total_amount = 0;
foreach ($prevsits as $situation) {
@@ -3335,9 +3335,10 @@ else if ($id > 0 || ! empty($ref))
}
$prevsits_total_amount += $object->total_ht;
- print price($prevsits_total_amount);
- print '</td>';
- print '<td>' . $langs->trans('Currency' . $conf->currency) . '</td></tr>';
+ print price($prevsits_total_amount, 0, $langs, 1, -1, -1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency) );
+
+ print '</td></tr>';
+
// Previous situation(s) deduction(s)
for ($i = 0; $i < $cprevsits; $i++) {
@@ -3348,10 +3349,10 @@ else if ($id > 0 || ! empty($ref))
print $prevsits[$i]->situation_counter;
print '</a></td>';
- print '<td align="right" class="nowrap">';
- print '- ' . price($prevsits[$i]->total_ht);
- print '</td>';
- print '<td>' . $langs->trans('Currency' . $conf->currency) . '</td></tr>';
+ print '<td align="left" class="nowrap">';
+ print '- ' . price($prevsits[$i]->total_ht, 0, $langs, 1, -1, -1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency) );
+ print '</td></tr>';
+
}
}
}
--
GitLab