From ba1f4f0ac6e2632df8436ff61df05c9ac8980171 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 7 Nov 2019 16:40:59 +0100
Subject: [PATCH] Fix look and feel v11

---
 .../cheque/class/remisecheque.class.php       | 60 +++++++------------
 1 file changed, 20 insertions(+), 40 deletions(-)

diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index 6f0438644a6..220cf93c180 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -65,6 +65,10 @@ class RemiseCheque extends CommonObject
 	 */
 	public $ref;
 
+	const STATUS_DRAFT = 0;
+	const STATUS_VALIDATED = 1;
+
+
 	/**
 	 *	Constructor
 	 *
@@ -1072,50 +1076,26 @@ class RemiseCheque extends CommonObject
 	/**
 	 *  Return label of a status
 	 *
-	 *  @param	int		$status     Statut
+	 *  @param	int		$status     Id status
 	 *  @param  int		$mode		0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=Long label + picto
 	 *  @return string      		Libelle du statut
 	 */
     public function LibStatut($status, $mode = 0)
     {
-        // phpcs:enable
-		global $langs;	// TODO Renvoyer le libelle anglais et faire traduction a affichage
-		$langs->load('compta');
-		if ($mode == 0)
-		{
-			if ($status == 0) return $langs->trans('ToValidate');
-			elseif ($status == 1) return $langs->trans('Validated');
-		}
-		elseif ($mode == 1)
-		{
-			if ($status == 0) return $langs->trans('ToValidate');
-			elseif ($status == 1) return $langs->trans('Validated');
-		}
-		elseif ($mode == 2)
-		{
-			if ($status == 0) return img_picto($langs->trans('ToValidate'), 'statut0').' '.$langs->trans('ToValidate');
-			elseif ($status == 1) return img_picto($langs->trans('Validated'), 'statut4').' '.$langs->trans('Validated');
-		}
-		elseif ($mode == 3)
-		{
-			if ($status == 0) return img_picto($langs->trans('ToValidate'), 'statut0');
-			elseif ($status == 1) return img_picto($langs->trans('Validated'), 'statut4');
-		}
-		elseif ($mode == 4)
-		{
-			if ($status == 0) return img_picto($langs->trans('ToValidate'), 'statut0').' '.$langs->trans('ToValidate');
-			elseif ($status == 1) return img_picto($langs->trans('Validated'), 'statut4').' '.$langs->trans('Validated');
-		}
-		elseif ($mode == 5)
-		{
-			if ($status == 0) return $langs->trans('ToValidate').' '.img_picto($langs->trans('ToValidate'), 'statut0');
-			elseif ($status == 1) return $langs->trans('Validated').' '.img_picto($langs->trans('Validated'), 'statut4');
-		}
-		elseif ($mode == 6)
-		{
-			if ($status == 0) return $langs->trans('ToValidate').' '.img_picto($langs->trans('ToValidate'), 'statut0');
-			elseif ($status == 1) return $langs->trans('Validated').' '.img_picto($langs->trans('Validated'), 'statut4');
-		}
-		return $langs->trans('Unknown');
+    	// phpcs:enable
+    	if (empty($this->labelStatus) || empty($this->labelStatusShort))
+    	{
+    		global $langs;
+    		$langs->load('compta');
+    		$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('ToValidate');
+    		$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Validated');
+    		$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('ToValidate');
+    		$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Validated');
+    	}
+
+    	$statusType = 'status'.$status;
+    	if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
+
+    	return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
     }
 }