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

Merge pull request #6996 from atm-ph/fix_5.0_display_situtation_amount

Browse Source 
Fix display on situation invoice
This commit is contained in:
Laurent Destailleur 2017-06-13 15:01:44 +02:00 committed by GitHub
commit 9e5af63c2c
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/compta/facture.php
View File

@ -3327,7 +3327,7 @@ else if ($id > 0 || ! empty($ref))
print $object->situation_counter; print $object->situation_counter;
print '</td>'; print '</td>';
print '<td align="right" class="nowrap">'; print '<td align="left" class="nowrap">';
$prevsits_total_amount = 0; $prevsits_total_amount = 0;
foreach ($prevsits as $situation) { foreach ($prevsits as $situation) {
@ -3335,9 +3335,10 @@ else if ($id > 0 || ! empty($ref))
} }
$prevsits_total_amount += $object->total_ht; $prevsits_total_amount += $object->total_ht;
print price($prevsits_total_amount); print price($prevsits_total_amount, 0, $langs, 1, -1, -1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency) );
print '</td>';
print '<td>' . $langs->trans('Currency' . $conf->currency) . '</td></tr>'; print '</td></tr>';
// Previous situation(s) deduction(s) // Previous situation(s) deduction(s)
for ($i = 0; $i < $cprevsits; $i++) { for ($i = 0; $i < $cprevsits; $i++) {
@ -3348,10 +3349,10 @@ else if ($id > 0 || ! empty($ref))
print $prevsits[$i]->situation_counter; print $prevsits[$i]->situation_counter;
print '</a></td>'; print '</a></td>';
print '<td align="right" class="nowrap">'; print '<td align="left" class="nowrap">';
print '- ' . price($prevsits[$i]->total_ht); print '- ' . price($prevsits[$i]->total_ht, 0, $langs, 1, -1, -1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency) );
print '</td>'; print '</td></tr>';
print '<td>' . $langs->trans('Currency' . $conf->currency) . '</td></tr>';
} }
} }
} }