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

The warning for late orders is visible on order card

Browse Source
This commit is contained in:
Laurent Destailleur 2016-03-10 10:50:54 +01:00
parent e0681d0165
commit ba5b0efb53
4 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/commande/card.php
View File

@ -1931,7 +1931,7 @@ if ($action == 'create' && $user->rights->commande->creer)
/* /*
* Commande * Commande
*/ */
$nbrow = 9; $nbrow = 9;
if (! empty($conf->projet->enabled)) if (! empty($conf->projet->enabled))
$nbrow ++; $nbrow ++;
@ -2050,6 +2050,9 @@ if ($action == 'create' && $user->rights->commande->creer)
print '</form>'; print '</form>';
} else { } else {
print $object->date ? dol_print_date($object->date, 'daytext') : '&nbsp;'; 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 '</td>';
print '</tr>'; print '</tr>';
@ -2072,6 +2075,9 @@ if ($action == 'create' && $user->rights->commande->creer)
print '</form>'; print '</form>';
} else { } else {
print $object->date_livraison ? dol_print_date($object->date_livraison, 'daytext') : '&nbsp;'; 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 '</td>';
print '</tr>'; print '</tr>';

16
htdocs/commande/class/commande.class.php
View File

@ -3436,6 +3436,22 @@ class Commande extends CommonOrder
return max($this->date_commande, $this->date_livraison) < ($now - $conf->commande->client->warning_delay); 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;
}
} }

2
htdocs/commande/list.php
View File

@ -554,7 +554,7 @@ if ($resql)
// Warning late icon // Warning late icon
print '<td class="nobordernopadding nowrap">'; print '<td class="nobordernopadding nowrap">';
if ($generic_commande->hasDelay()) { 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)) if(!empty($objp->note_private))
{ {

10
htdocs/expedition/shipment.php
View File

@ -265,7 +265,12 @@ if ($id > 0 || ! empty($ref))
// Date // Date
print '<tr><td>'.$langs->trans('Date').'</td>'; 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>'; print '</tr>';
// Delivery date planned // Delivery date planned
@ -289,6 +294,9 @@ if ($id > 0 || ! empty($ref))
else else
{ {
print dol_print_date($commande->date_livraison,'daytext'); 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>'; print '</td>';
// Note on several rows // Note on several rows