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

Merge pull request #24930 from Je2fb/patch-5

Browse Source 
Update commande.class.php
This commit is contained in:
Laurent Destailleur
2023-06-04 15:19:24 +02:00
committed by GitHub
parent 93c8a35ec1 735ad3d533
commit 950d9cb158
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4120,7 +4120,7 @@ class Commande extends CommonOrder
$now = dol_now(); $now = dol_now();
return max($this->date, $this->date_livraison) < ($now - $conf->commande->client->warning_delay); return max($this->date, $this->delivery_date) < ($now - $conf->commande->client->warning_delay);
} }
/** /**
@@ -4132,7 +4132,7 @@ class Commande extends CommonOrder
{ {
global $conf, $langs; global $conf, $langs;
if (empty($this->date_livraison)) { if (empty($this->delivery_date)) {
$text = $langs->trans("OrderDate").' '.dol_print_date($this->date_commande, 'day'); $text = $langs->trans("OrderDate").' '.dol_print_date($this->date_commande, 'day');
} else { } else {
$text = $text = $langs->trans("DeliveryDate").' '.dol_print_date($this->date_livraison, 'day'); $text = $text = $langs->trans("DeliveryDate").' '.dol_print_date($this->date_livraison, 'day');