Skip to content
Snippets Groups Projects
Commit ba5b0efb authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

The warning for late orders is visible on order card

parent e0681d01
No related branches found
No related tags found
No related merge requests found
......@@ -1931,7 +1931,7 @@ if ($action == 'create' && $user->rights->commande->creer)
/*
* Commande
*/
*/
$nbrow = 9;
if (! empty($conf->projet->enabled))
$nbrow ++;
......@@ -2050,6 +2050,9 @@ if ($action == 'create' && $user->rights->commande->creer)
print '</form>';
} else {
print $object->date ? dol_print_date($object->date, 'daytext') : '&nbsp;';
if ($object->hasDelay() && empty($object->date_livraison)) {
print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
}
}
print '</td>';
print '</tr>';
......@@ -2072,6 +2075,9 @@ if ($action == 'create' && $user->rights->commande->creer)
print '</form>';
} else {
print $object->date_livraison ? dol_print_date($object->date_livraison, 'daytext') : '&nbsp;';
if ($object->hasDelay() && ! empty($object->date_livraison)) {
print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
}
}
print '</td>';
print '</tr>';
......
......@@ -3436,6 +3436,22 @@ class Commande extends CommonOrder
return max($this->date_commande, $this->date_livraison) < ($now - $conf->commande->client->warning_delay);
}
/**
* Show the customer delayed info
*
* @return string Show delayed information
*/
public function showDelay()
{
global $conf, $langs;
if (empty($this->date_livraison)) $text=$langs->trans("OrderDate").' '.dol_print_date($this->date_commande, 'day');
else $text=$text=$langs->trans("DeliveryDate").' '.dol_print_date($this->date_livraison, 'day');
$text.=' '.($conf->commande->client->warning_delay>0?'+':'-').' '.round(abs($conf->commande->client->warning_delay)/3600/24,1).' '.$langs->trans("days").' < '.$langs->trans("Today");
return $text;
}
}
......
......@@ -554,7 +554,7 @@ if ($resql)
// Warning late icon
print '<td class="nobordernopadding nowrap">';
if ($generic_commande->hasDelay()) {
print img_picto($langs->trans("Late"), "warning");
print img_picto($langs->trans("Late").' : '.$generic_commande->showDelay(), "warning");
}
if(!empty($objp->note_private))
{
......
......@@ -265,7 +265,12 @@ if ($id > 0 || ! empty($ref))
// Date
print '<tr><td>'.$langs->trans('Date').'</td>';
print '<td colspan="2">'.dol_print_date($commande->date,'daytext').'</td>';
print '<td colspan="2">';
print dol_print_date($commande->date,'daytext');
if ($commande->hasDelay() && empty($commande->date_livraison)) {
print ' '.img_picto($langs->trans("Late").' : '.$commande->showDelay(), "warning");
}
print '</td>';
print '</tr>';
// Delivery date planned
......@@ -289,6 +294,9 @@ if ($id > 0 || ! empty($ref))
else
{
print dol_print_date($commande->date_livraison,'daytext');
if ($commande->hasDelay() && ! empty($commande->date_livraison)) {
print ' '.img_picto($langs->trans("Late").' : '.$commande->showDelay(), "warning");
}
}
print '</td>';
// Note on several rows
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment