Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-21 16:23:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression with label of order

Browse Source
This commit is contained in:
Laurent Destailleur
2023-09-19 20:29:24 +02:00
parent 69e7f0f1f3
commit 492b726da9
4 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -399,8 +399,8 @@ class Commande extends CommonOrder
/**
* Shipment on process
*/
const STATUS_SHIPMENTONPROCESS = 2;
const STATUS_ACCEPTED = 2; // For backward compatibility. Use key STATUS_SHIPMENTONPROCESS instead.
const STATUS_SHIPMENTONPROCESS = 2; // We set this status when a shipment is validated
const STATUS_ACCEPTED = 2; // For backward compatibility. Use key STATUS_SHIPMENTONPROCESS instead.
/**
* Closed (Sent, billed or not)
@@ -3729,7 +3729,7 @@ class Commande extends CommonOrder
$labelTooltip .= ' - '.$langs->transnoentitiesnoconv("DateDeliveryPlanned").dol_print_date($this->delivery_date, 'day').$billedtext;
}
$statusType = 'status4';
} elseif ($status == self::STATUS_CLOSED && (!empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
} elseif ($status == self::STATUS_CLOSED) {
$labelStatus = $langs->transnoentitiesnoconv('StatusOrderDelivered');
$labelStatusShort = $langs->transnoentitiesnoconv('StatusOrderDeliveredShort');
$statusType = 'status6';