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

FIX Css of amount on remain to pay on expense report

Browse Source
This commit is contained in:
Laurent Destailleur
2018-12-17 13:57:30 +01:00
parent 6b5c0d1ea1
commit 17b2fd295f
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/core/lib/functions.lib.php
View File

@@ -1442,6 +1442,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
{ {
if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS)) // If you experienc trouble with pdf thumb generation and imagick, you can disable here. if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS)) // If you experienc trouble with pdf thumb generation and imagick, you can disable here.
{ {
include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
$ret = dol_convert_file($file, 'png', $fileimage); $ret = dol_convert_file($file, 'png', $fileimage);
if ($ret < 0) $error++; if ($ret < 0) $error++;
} }

20
htdocs/expensereport/card.php
View File

@@ -1955,16 +1955,26 @@ else
} }
$totalpaid = price2num($totalpaid); // Round $totalpaid to fix floating problem after addition into loop $totalpaid = price2num($totalpaid); // Round $totalpaid to fix floating problem after addition into loop
if ($object->paid == 0) $remaintopay = price2num($object->total_ttc - $totalpaid);
$resteapayeraffiche = $remaintopay;
$cssforamountpaymentcomplete = 'amountpaymentcomplete';
if ($object->status == ExpenseReport::STATUS_REFUSED)
{ {
$cssforamountpaymentcomplete = 'amountpaymentneutral';
$resteapayeraffiche = 0;
}
elseif ($object->paid == 0)
{
$cssforamountpaymentcomplete = 'amountpaymentneutral';
}
print '<tr><td colspan="' . $nbcols . '" align="right">'.$langs->trans("AlreadyPaid").':</td><td align="right">'.price($totalpaid).'</td><td></td></tr>'; print '<tr><td colspan="' . $nbcols . '" align="right">'.$langs->trans("AlreadyPaid").':</td><td align="right">'.price($totalpaid).'</td><td></td></tr>';
print '<tr><td colspan="' . $nbcols . '" align="right">'.$langs->trans("AmountExpected").':</td><td align="right">'.price($object->total_ttc).'</td><td></td></tr>'; print '<tr><td colspan="' . $nbcols . '" align="right">'.$langs->trans("AmountExpected").':</td><td align="right">'.price($object->total_ttc).'</td><td></td></tr>';
$remaintopay = price2num($object->total_ttc - $totalpaid);
print '<tr><td colspan="' . $nbcols . '" align="right">'.$langs->trans("RemainderToPay").':</td>'; print '<tr><td colspan="' . $nbcols . '" align="right">'.$langs->trans("RemainderToPay").':</td>';
print '<td align="right"'.($remaintopay?' class="amountremaintopay"':'').'>'.price($remaintopay).'</td><td></td></tr>'; print '<td align="right"'.($resteapayeraffiche?' class="amountremaintopay"':(' class="'.$cssforamountpaymentcomplete.'"')).'>'.price($resteapayeraffiche).'</td><td></td></tr>';
}
$db->free($resql); $db->free($resql);
} }
else else