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

Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur
2023-06-04 19:07:04 +02:00
parent eb8d54e464 935a730fbc
commit 89e378bc78
4 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4181,7 +4181,7 @@ class Commande extends CommonOrder
$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);
}
/**
@@ -4193,7 +4193,7 @@ class Commande extends CommonOrder
{
global $conf, $langs;
if (empty($this->date_livraison)) {
if (empty($this->delivery_date)) {
$text = $langs->trans("OrderDate").' '.dol_print_date($this->date_commande, 'day');
} else {
$text = $text = $langs->trans("DeliveryDate").' '.dol_print_date($this->date_livraison, 'day');