Skip to content
Snippets Groups Projects
Commit 8e8fd724 authored by Christophe Battarel's avatar Christophe Battarel
Browse files

correct margin infos display on order

parent 34132de7
No related branches found
No related tags found
Show whitespace changes
Inline Side-by-side
htdocs/compta/facture.php
+ 6
− 6
View file @ 8e8fd724
...@@ -2765,6 +2765,12 @@ else if ($id > 0 || ! empty($ref)) ...@@ -2765,6 +2765,12 @@ else if ($id > 0 || ! empty($ref))
print '</table>'; print '</table>';
// Margin Infos
if ($conf->marges->enabled) {
print '<br>';
$object->displayMarginInfos($object->statut > 0);
}
print '</td></tr>'; print '</td></tr>';
// Date payment term // Date payment term
...@@ -2843,12 +2849,6 @@ else if ($id > 0 || ! empty($ref)) ...@@ -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 '<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>'; 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>'; print '</tr>';
// Amount Local Taxes // Amount Local Taxes
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment