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

Merge pull request #13252 from aspangaro/12.0_a20

Browse Source 
FIX: Nowrap on amount
This commit is contained in:
Laurent Destailleur 2020-03-03 21:44:54 +01:00 committed by GitHub
commit c3137142fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/compta/facture/invoicetemplate_list.php
View File

@ -536,21 +536,21 @@ if ($resql)
} }
if (!empty($arrayfields['f.total']['checked'])) if (!empty($arrayfields['f.total']['checked']))
{ {
print '<td class="right">'.price($objp->total).'</td>'."\n"; print '<td class="nowrap right">'.price($objp->total).'</td>'."\n";
if (!$i) $totalarray['nbfield']++; if (!$i) $totalarray['nbfield']++;
if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total'; if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total';
$totalarray['val']['f.total'] += $objp->total; $totalarray['val']['f.total'] += $objp->total;
} }
if (!empty($arrayfields['f.tva']['checked'])) if (!empty($arrayfields['f.tva']['checked']))
{ {
print '<td class="right">'.price($objp->total_vat).'</td>'."\n"; print '<td class="nowrap right">'.price($objp->total_vat).'</td>'."\n";
if (!$i) $totalarray['nbfield']++; if (!$i) $totalarray['nbfield']++;
if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.tva'; if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.tva';
$totalarray['val']['f.tva'] += $objp->total_vat; $totalarray['val']['f.tva'] += $objp->total_vat;
} }
if (!empty($arrayfields['f.total_ttc']['checked'])) if (!empty($arrayfields['f.total_ttc']['checked']))
{ {
print '<td class="right">'.price($objp->total_ttc).'</td>'."\n"; print '<td class="nowrap right">'.price($objp->total_ttc).'</td>'."\n";
if (!$i) $totalarray['nbfield']++; if (!$i) $totalarray['nbfield']++;
if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total_ttc'; if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total_ttc';
$totalarray['val']['f.total_ttc'] += $objp->total_ttc; $totalarray['val']['f.total_ttc'] += $objp->total_ttc;