From 8059463941de5b374ff85bb30b90bdcaa7c2e48f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 20 Dec 2019 17:54:54 +0100 Subject: [PATCH] Debug v11 --- htdocs/fourn/class/fournisseur.commande.class.php | 3 +-- htdocs/modulebuilder/template/class/myobject.class.php | 2 +- htdocs/mrp/class/mo.class.php | 4 +++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 54aa70469e2..d153f8756c7 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -670,10 +670,9 @@ class CommandeFournisseur extends CommonOrder 2 => 'status3', 3 => 'status3', 4 => 'status3', - 5 => 'status6', + 5 => 'status4', 6 => 'status5', 7 => 'status5', - 9 => 'status5', ); diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php index bfdecb48100..d7a157c682f 100644 --- a/htdocs/modulebuilder/template/class/myobject.class.php +++ b/htdocs/modulebuilder/template/class/myobject.class.php @@ -803,7 +803,7 @@ class MyObject extends CommonObject } $statusType = 'status'.$status; - if ($status == self::STATUS_VALIDATED) $statusType = 'status4'; + //if ($status == self::STATUS_VALIDATED) $statusType = 'status1'; if ($status == self::STATUS_CANCELED) $statusType = 'status6'; return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode); diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php index 94f32e0da1c..cc51515eeb6 100644 --- a/htdocs/mrp/class/mo.class.php +++ b/htdocs/mrp/class/mo.class.php @@ -987,7 +987,9 @@ class Mo extends CommonObject } $statusType = 'status'.$status; - if ($status == self::STATUS_VALIDATED) $statusType = 'status4'; + if ($status == self::STATUS_VALIDATED) $statusType = 'status1'; + if ($status == self::STATUS_INPROGRESS) $statusType = 'status3'; + if ($status == self::STATUS_PRODUCED) $statusType = 'status5'; if ($status == self::STATUS_CANCELED) $statusType = 'status6'; return dolGetStatus($this->labelStatus[$status], $this->labelStatus[$status], '', $statusType, $mode);