Debug v17
This commit is contained in:
parent
9674d234ba
commit
f3f67c2f6f
@ -2411,15 +2411,15 @@ if ($resql) {
|
||||
print '<td class="right nowrap">'.price($marginInfo['pa_total'], 0, $langs, 1, -1, 'MT').'</td>';
|
||||
if (!$i) {
|
||||
$totalarray['nbfield']++;
|
||||
$totalarray['pos'][$totalarray['nbfield']] = 'total_pa';
|
||||
}
|
||||
$totalarray['val']['total_pa'] += $marginInfo['pa_total'];
|
||||
}
|
||||
// Total margin
|
||||
if (!empty($arrayfields['total_margin']['checked'])) {
|
||||
print '<td class="right nowrap">'.price($marginInfo['total_margin'], 0, $langs, 1, -1, 'MT').'</td>';
|
||||
if (!$i) {
|
||||
$totalarray['nbfield']++;
|
||||
}
|
||||
if (!$i) {
|
||||
$totalarray['pos'][$totalarray['nbfield']] = 'total_margin';
|
||||
}
|
||||
$totalarray['val']['total_margin'] += $marginInfo['total_margin'];
|
||||
@ -2549,6 +2549,7 @@ if ($resql) {
|
||||
}
|
||||
|
||||
// Use correct digits number for totals
|
||||
$totalarray['val']['total_pa'] = (isset($totalarray['val']['total_pa']) ? price2num($totalarray['val']['total_pa'], 'MT') : null);
|
||||
$totalarray['val']['total_margin'] = (isset($totalarray['val']['total_margin']) ? price2num($totalarray['val']['total_margin'], 'MT') : null);
|
||||
|
||||
// Show total line
|
||||
|
||||
Loading…
Reference in New Issue
Block a user