From 2dee5e6bf14037c35cb7bd44450222445268096c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 21 Dec 2019 14:35:39 +0100
Subject: [PATCH] Fix delay and useless code

---
 htdocs/bom/class/bom.class.php | 1 +
 htdocs/commande/card.php       | 3 ++-
 htdocs/commande/list.php       | 3 +--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 51cdb342dc3..a0a36011cad 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -829,6 +829,7 @@ class BOM extends CommonObject
 
 		$statusType = 'status'.$status;
 		if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
+		if ($status == self::STATUS_CANCELED) $statusType = 'status6';
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatus[$status], '', $statusType, $mode);
 	}
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index c3ba8426d5a..c1dfd1ae43b 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1666,6 +1666,7 @@ if ($action == 'create' && $usercancreate)
 
 		print '</td></tr>';
 	}
+
 	// Date
 	print '<tr><td class="fieldrequired">'.$langs->trans('Date').'</td><td>';
 	print $form->selectDate('', 're', '', '', '', "crea_commande", 1, 1); // Always autofill date with current date
@@ -2183,7 +2184,7 @@ if ($action == 'create' && $usercancreate)
 			print '</form>';
 		} else {
 			print $object->date ? dol_print_date($object->date, 'day') : '&nbsp;';
-			if ($object->hasDelay() && !empty($object->date_livraison)) {
+			if ($object->hasDelay()) {
 				print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
 			}
 		}
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 417f7384aff..f28d2a637b2 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -816,8 +816,7 @@ if ($resql)
 		{
 			print '<td class="nowrap">';
 
-			$generic_commande->lines = array();
-			$generic_commande->getLinesArray();
+			$generic_commande->getLinesArray();		// This set ->lines
 
 			print $generic_commande->getNomUrl(1, ($viewstatut != 2 ? 0 : $obj->fk_statut), 0, 0, 0, 1);