Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

FIX #11364

Browse Source
This commit is contained in:
Laurent Destailleur
2019-11-05 12:47:38 +01:00
parent 4d84ee2041
commit ce1dec253f
41 changed files with 240 additions and 812 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
htdocs/commande/list.php
View File

@@ -1057,24 +1057,25 @@ if ($resql)
{
print '<td class="right">'.price($obj->total_ht)."</td>\n";
if (! $i) $totalarray['nbfield']++;
if (! $i) $totalarray['totalhtfield']=$totalarray['nbfield'];
$totalarray['totalht'] += $obj->total_ht;
if (! $i) $totalarray['pos'][$totalarray['nbfield']]='c.total_ht';
$totalarray['val']['c.total_ht'] += $obj->total_ht;
}
// Amount VAT
if (! empty($arrayfields['c.total_vat']['checked']))
{
print '<td class="right">'.price($obj->total_tva)."</td>\n";
if (! $i) $totalarray['nbfield']++;
if (! $i) $totalarray['totalvatfield']=$totalarray['nbfield'];
$totalarray['totalvat'] += $obj->total_tva;
if (! $i) $totalarray['pos'][$totalarray['nbfield']]='c.total_tva';
$totalarray['val']['c.total_tva'] += $obj->total_tva;
}
// Amount TTC
if (! empty($arrayfields['c.total_ttc']['checked']))
{
print '<td class="right">'.price($obj->total_ttc)."</td>\n";
if (! $i) $totalarray['nbfield']++;
if (! $i) $totalarray['totalttcfield']=$totalarray['nbfield'];
$totalarray['totalttc'] += $obj->total_ttc;
if (! $i) $totalarray['pos'][$totalarray['nbfield']]='c.total_ttc';
$totalarray['val']['c.total_ttc'] += $obj->total_ttc;
}
// Extra fields
@@ -1139,30 +1140,7 @@ if ($resql)
}
// Show total line
if (isset($totalarray['totalhtfield'])
|| isset($totalarray['totalvatfield'])
|| isset($totalarray['totalttcfield'])
|| isset($totalarray['totalamfield'])
|| isset($totalarray['totalrtpfield'])
)
{
print '<tr class="liste_total">';
$i=0;
while ($i < $totalarray['nbfield'])
{
$i++;
if ($i == 1)
{
if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
}
elseif ($totalarray['totalhtfield'] == $i) print '<td class="right">'.price($totalarray['totalht']).'</td>';
elseif ($totalarray['totalvatfield'] == $i) print '<td class="right">'.price($totalarray['totalvat']).'</td>';
elseif ($totalarray['totalttcfield'] == $i) print '<td class="right">'.price($totalarray['totalttc']).'</td>';
else print '<td></td>';
}
print '</tr>';
}
include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
$db->free($resql);