This commit is contained in:
Laurent Destailleur 2020-08-29 02:35:24 +02:00
parent 983a3c59c8
commit 5eca65f673
2 changed files with 27 additions and 23 deletions

View File

@ -1206,7 +1206,7 @@ if ($resql)
// Ref
if (!empty($arrayfields['f.ref']['checked']))
{
print '<td class="nowrap">';
print '<td class="nowraponall">';
print '<table class="nobordernopadding"><tr class="nocellnopadd">';
@ -1242,7 +1242,7 @@ if ($resql)
// Type
if (!empty($arrayfields['f.type']['checked']))
{
print '<td class="nowrap">';
print '<td class="nowraponall tdoverflowmax100" title="'.$facturestatic->getLibType().'">';
print $facturestatic->getLibType();
print "</td>";
if (!$i) $totalarray['nbfield']++;
@ -1251,7 +1251,7 @@ if ($resql)
// Date
if (!empty($arrayfields['f.date']['checked']))
{
print '<td align="center" class="nowrap">';
print '<td align="center" class="nowraponall">';
print dol_print_date($db->jdate($obj->df), 'day');
print '</td>';
if (!$i) $totalarray['nbfield']++;
@ -1260,7 +1260,7 @@ if ($resql)
// Date
if (!empty($arrayfields['f.date_valid']['checked']))
{
print '<td align="center" class="nowrap">';
print '<td align="center" class="nowraponall">';
print dol_print_date($db->jdate($obj->date_valid), 'day');
print '</td>';
if (!$i) $totalarray['nbfield']++;
@ -1269,7 +1269,7 @@ if ($resql)
// Date limit
if (!empty($arrayfields['f.date_lim_reglement']['checked']))
{
print '<td align="center" class="nowrap">'.dol_print_date($datelimit, 'day');
print '<td align="center" class="nowraponall">'.dol_print_date($datelimit, 'day');
if ($facturestatic->hasDelay())
{
print img_warning($langs->trans('Alert').' - '.$langs->trans('Late'));
@ -1281,7 +1281,7 @@ if ($resql)
// Project ref
if (!empty($arrayfields['p.ref']['checked']))
{
print '<td class="nocellnopadd nowrap">';
print '<td class="nocellnopadd nowraponall">';
if ($obj->project_id > 0)
{
print $projectstatic->getNomUrl(1);
@ -1293,7 +1293,7 @@ if ($resql)
// Project title
if (!empty($arrayfields['p.title']['checked']))
{
print '<td class="nowrap">';
print '<td class="nowraponall">';
if ($obj->project_id > 0)
{
print $projectstatic->title;
@ -1326,7 +1326,7 @@ if ($resql)
// Zip
if (!empty($arrayfields['s.zip']['checked']))
{
print '<td>';
print '<td class="nowraponall">';
print $obj->zip;
print '</td>';
if (!$i) $totalarray['nbfield']++;
@ -1368,7 +1368,7 @@ if ($resql)
// Payment mode
if (!empty($arrayfields['f.fk_mode_reglement']['checked']))
{
print '<td>';
print '<td class="tdoverflowmax100">';
$form->form_modes_reglement($_SERVER['PHP_SELF'], $obj->fk_mode_reglement, 'none', '', -1);
print '</td>';
if (!$i) $totalarray['nbfield']++;
@ -1404,7 +1404,7 @@ if ($resql)
// Amount HT
if (!empty($arrayfields['f.total_ht']['checked']))
{
print '<td class="right nowrap">'.price($obj->total_ht)."</td>\n";
print '<td class="right nowraponall">'.price($obj->total_ht)."</td>\n";
if (!$i) $totalarray['nbfield']++;
if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total_ht';
$totalarray['val']['f.total_ht'] += $obj->total_ht;
@ -1412,7 +1412,7 @@ if ($resql)
// Amount VAT
if (!empty($arrayfields['f.total_vat']['checked']))
{
print '<td class="right nowrap">'.price($obj->total_vat)."</td>\n";
print '<td class="right nowraponall">'.price($obj->total_vat)."</td>\n";
if (!$i) $totalarray['nbfield']++;
if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total_vat';
$totalarray['val']['f.total_vat'] += $obj->total_vat;
@ -1420,7 +1420,7 @@ if ($resql)
// Amount LocalTax1
if (!empty($arrayfields['f.total_localtax1']['checked']))
{
print '<td class="right nowrap">'.price($obj->total_localtax1)."</td>\n";
print '<td class="right nowraponall">'.price($obj->total_localtax1)."</td>\n";
if (!$i) $totalarray['nbfield']++;
if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total_localtax1';
$totalarray['val']['f.total_localtax1'] += $obj->total_localtax1;
@ -1428,7 +1428,7 @@ if ($resql)
// Amount LocalTax2
if (!empty($arrayfields['f.total_localtax2']['checked']))
{
print '<td class="right nowrap">'.price($obj->total_localtax2)."</td>\n";
print '<td class="right nowraponall">'.price($obj->total_localtax2)."</td>\n";
if (!$i) $totalarray['nbfield']++;
if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total_localtax2';
$totalarray['val']['f.total_localtax2'] += $obj->total_localtax2;
@ -1436,7 +1436,7 @@ if ($resql)
// Amount TTC
if (!empty($arrayfields['f.total_ttc']['checked']))
{
print '<td class="right nowrap">'.price($obj->total_ttc)."</td>\n";
print '<td class="right nowraponall">'.price($obj->total_ttc)."</td>\n";
if (!$i) $totalarray['nbfield']++;
if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total_ttc';
$totalarray['val']['f.total_ttc'] += $obj->total_ttc;
@ -1461,7 +1461,7 @@ if ($resql)
if (!empty($arrayfields['dynamount_payed']['checked']))
{
print '<td class="right nowrap">'.(!empty($totalpay) ?price($totalpay, 0, $langs) : '&nbsp;').'</td>'; // TODO Use a denormalized field
print '<td class="right nowraponall">'.(!empty($totalpay) ?price($totalpay, 0, $langs) : '&nbsp;').'</td>'; // TODO Use a denormalized field
if (!$i) $totalarray['nbfield']++;
if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalam';
$totalarray['val']['totalam'] += $totalpay;
@ -1470,7 +1470,7 @@ if ($resql)
// Pending amount
if (!empty($arrayfields['rtp']['checked']))
{
print '<td class="right nowrap">';
print '<td class="right nowraponall">';
print (!empty($remaintopay) ? price($remaintopay, 0, $langs) : '&nbsp;');
print '</td>'; // TODO Use a denormalized field
if (!$i) $totalarray['nbfield']++;
@ -1482,14 +1482,14 @@ if ($resql)
// Currency
if (!empty($arrayfields['f.multicurrency_code']['checked']))
{
print '<td class="nowrap">'.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)."</td>\n";
print '<td class="nowraponall">'.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)."</td>\n";
if (!$i) $totalarray['nbfield']++;
}
// Currency rate
if (!empty($arrayfields['f.multicurrency_tx']['checked']))
{
print '<td class="nowrap">';
print '<td class="nowraponall">';
$form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);
print "</td>\n";
if (!$i) $totalarray['nbfield']++;
@ -1497,31 +1497,31 @@ if ($resql)
// Amount HT
if (!empty($arrayfields['f.multicurrency_total_ht']['checked']))
{
print '<td class="right nowrap">'.price($obj->multicurrency_total_ht)."</td>\n";
print '<td class="right nowraponall">'.price($obj->multicurrency_total_ht)."</td>\n";
if (!$i) $totalarray['nbfield']++;
}
// Amount VAT
if (!empty($arrayfields['f.multicurrency_total_vat']['checked']))
{
print '<td class="right nowrap">'.price($obj->multicurrency_total_vat)."</td>\n";
print '<td class="right nowraponall">'.price($obj->multicurrency_total_vat)."</td>\n";
if (!$i) $totalarray['nbfield']++;
}
// Amount TTC
if (!empty($arrayfields['f.multicurrency_total_ttc']['checked']))
{
print '<td class="right nowrap">'.price($obj->multicurrency_total_ttc)."</td>\n";
print '<td class="right nowraponall">'.price($obj->multicurrency_total_ttc)."</td>\n";
if (!$i) $totalarray['nbfield']++;
}
if (!empty($arrayfields['multicurrency_dynamount_payed']['checked']))
{
print '<td class="right nowrap">'.(!empty($multicurrency_totalpay) ?price($multicurrency_totalpay, 0, $langs) : '&nbsp;').'</td>'; // TODO Use a denormalized field
print '<td class="right nowraponall">'.(!empty($multicurrency_totalpay) ?price($multicurrency_totalpay, 0, $langs) : '&nbsp;').'</td>'; // TODO Use a denormalized field
if (!$i) $totalarray['nbfield']++;
}
// Pending amount
if (!empty($arrayfields['multicurrency_rtp']['checked']))
{
print '<td class="right nowrap">';
print '<td class="right nowraponall">';
print (!empty($multicurrency_remaintopay) ? price($multicurrency_remaintopay, 0, $langs) : '&nbsp;');
print '</td>'; // TODO Use a denormalized field
if (!$i) $totalarray['nbfield']++;

View File

@ -3082,6 +3082,10 @@ table.paddingtopbottomonly tr td {
.liste_titre_filter {
background: var(--colorbacktitle1) !important;
}
.liste_titre2 {
background: var(--colorbackhmenu1) !important;
color: #fff;
}
table:not(.listwithfilterbefore) tr.liste_titre_filter:first-of-type td.liste_titre {
padding-top: 5px;
}