lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

correct margin infos display on order

Browse Source
This commit is contained in:
Christophe Battarel 2012-07-19 16:25:40 +02:00
parent 34132de71d
commit 8e8fd72459
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/compta/facture.php
View File

@ -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))
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