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

Fix late picto

Browse Source
This commit is contained in:
Laurent Destailleur 2022-01-28 17:59:58 +01:00
parent a631c94193
commit 2686541156
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/commande/list.php
View File

@ -1462,11 +1462,6 @@ if ($resql) {
print '<td class="nowraponall">'; print '<td class="nowraponall">';
print $generic_commande->getNomUrl(1, ($search_status != 2 ? 0 : $obj->fk_statut), 0, 0, 0, 1, 1); print $generic_commande->getNomUrl(1, ($search_status != 2 ? 0 : $obj->fk_statut), 0, 0, 0, 1, 1);
// Warning late icon and note
if ($generic_commande->hasDelay()) {
print img_picto($langs->trans("Late").' : '.$generic_commande->showDelay(), "warning");
}
$filename = dol_sanitizeFileName($obj->ref); $filename = dol_sanitizeFileName($obj->ref);
$filedir = $conf->commande->multidir_output[$conf->entity].'/'.dol_sanitizeFileName($obj->ref); $filedir = $conf->commande->multidir_output[$conf->entity].'/'.dol_sanitizeFileName($obj->ref);
$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid; $urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;
@ -1590,6 +1585,10 @@ if ($resql) {
if (!empty($arrayfields['c.date_commande']['checked'])) { if (!empty($arrayfields['c.date_commande']['checked'])) {
print '<td class="center">'; print '<td class="center">';
print dol_print_date($db->jdate($obj->date_commande), 'day'); print dol_print_date($db->jdate($obj->date_commande), 'day');
// Warning late icon and note
if ($generic_commande->hasDelay()) {
print img_picto($langs->trans("Late").' : '.$generic_commande->showDelay(), "warning");
}
print '</td>'; print '</td>';
if (!$i) { if (!$i) {
$totalarray['nbfield']++; $totalarray['nbfield']++;

4
htdocs/compta/index.php
View File

@ -210,11 +210,11 @@ if (!empty($conf->facture->enabled) && !empty($user->rights->facture->lire)) {
print '<td class="nobordernopadding nowraponall">'; print '<td class="nobordernopadding nowraponall">';
print $tmpinvoice->getNomUrl(1, ''); print $tmpinvoice->getNomUrl(1, '');
print '</td>'; print '</td>';
print '<td width="20" class="nobordernopadding nowrap">';
if ($tmpinvoice->hasDelay()) { if ($tmpinvoice->hasDelay()) {
print '<td width="20" class="nobordernopadding nowrap">';
print img_warning($langs->trans("Late")); print img_warning($langs->trans("Late"));
print '</td>';
} }
print '</td>';
print '<td width="16" class="nobordernopadding hideonsmartphone right">'; print '<td width="16" class="nobordernopadding hideonsmartphone right">';
$filename = dol_sanitizeFileName($obj->ref); $filename = dol_sanitizeFileName($obj->ref);
$filedir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($obj->ref); $filedir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($obj->ref);

12
htdocs/core/lib/invoice.lib.php
View File

@ -1196,11 +1196,6 @@ function getCustomerInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
print '<td class="nobordernopadding nowrap">'; print '<td class="nobordernopadding nowrap">';
print $tmpinvoice->getNomUrl(1, ''); print $tmpinvoice->getNomUrl(1, '');
print '</td>'; print '</td>';
print '<td width="20" class="nobordernopadding nowrap">';
if ($tmpinvoice->hasDelay()) {
print img_warning($langs->trans("Late"));
}
print '</td>';
print '<td width="16" class="nobordernopadding hideonsmartphone right">'; print '<td width="16" class="nobordernopadding hideonsmartphone right">';
$filename = dol_sanitizeFileName($obj->ref); $filename = dol_sanitizeFileName($obj->ref);
$filedir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($obj->ref); $filedir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($obj->ref);
@ -1212,7 +1207,12 @@ function getCustomerInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
print '<td class="nowrap tdoverflowmax100">'; print '<td class="nowrap tdoverflowmax100">';
print $societestatic->getNomUrl(1, 'customer'); print $societestatic->getNomUrl(1, 'customer');
print '</td>'; print '</td>';
print '<td class="right">'.dol_print_date($db->jdate($obj->datelimite), 'day').'</td>'; print '<td class="right">';
print dol_print_date($db->jdate($obj->datelimite), 'day');
if ($tmpinvoice->hasDelay()) {
print img_warning($langs->trans("Late"));
}
print '</td>';
if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) { if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
print '<td class="right"><span class="amount">'.price($obj->total_ht).'</span></td>'; print '<td class="right"><span class="amount">'.price($obj->total_ht).'</span></td>';
} }