From 8e8fd724590c87dbfd75e3fe5c4fc66d0ac61fc1 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Thu, 19 Jul 2012 16:25:40 +0200
Subject: [PATCH] correct margin infos display on order
---
htdocs/compta/facture.php | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index d612a1cd684..5d306dd6977 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -2765,6 +2765,12 @@ else if ($id > 0 || ! empty($ref))
print '</table>';
+ // Margin Infos
+ if ($conf->marges->enabled) {
+ print '<br>';
+ $object->displayMarginInfos($object->statut > 0);
+ }
+
print '</td></tr>';
// Date payment term
@@ -2843,12 +2849,6 @@ else if ($id > 0 || ! empty($ref))
print '<tr><td>'.$langs->trans('AmountVAT').'</td><td align="right" colspan="2" nowrap>'.price($object->total_tva).'</td>';
print '<td>'.$langs->trans('Currency'.$conf->currency).'</td>';
- // Margin Infos
- if ($conf->marges->enabled) {
- print '<td valign="top" width="50%" rowspan="4">';
- $object->displayMarginInfos();
- print '</td>';
- }
print '</tr>';
// Amount Local Taxes
--
GitLab