diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 203c6bd9f84..b36416291e6 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -3193,15 +3193,15 @@ class Propal extends CommonObject
 			$this->labelstatut_short[4]=$langs->trans("PropalStatusBilledShort");
 		}
 
-		$statuttrans='';
-		if ($statut==self::STATUS_DRAFT) $statuttrans='status0';
-		elseif ($statut==self::STATUS_VALIDATED) $statuttrans='status1';
-		elseif ($statut==self::STATUS_SIGNED) $statuttrans='status3';
-		elseif ($statut==self::STATUS_NOTSIGNED) $statuttrans='status5';
-		elseif ($statut==self::STATUS_BILLED) $statuttrans='status6';
+		$statusType='';
+		if ($statut==self::STATUS_DRAFT) $statusType='status0';
+		elseif ($statut==self::STATUS_VALIDATED) $statusType='status1';
+		elseif ($statut==self::STATUS_SIGNED) $statusType='status3';
+		elseif ($statut==self::STATUS_NOTSIGNED) $statusType='status5';
+		elseif ($statut==self::STATUS_BILLED) $statusType='status6';
 
 		
-		return dolGetStatus($this->labelstatut[$statut], $this->labelstatut_short[$statut], '', $statuttrans, $mode);
+		return dolGetStatus($this->labelstatut[$statut], $this->labelstatut_short[$statut], '', $statusType, $mode);
 		
 		
 	}
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 89336845501..390e0001594 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3428,46 +3428,46 @@ class Commande extends CommonOrder
 		if ($statut==self::STATUS_CANCELED){
 		    $labelstatut = $langs->trans('StatusOrderCanceled');
 		    $labelstatutShort = $langs->trans('StatusOrderCanceledShort');
-		    $statuttrans='status5';
+		    $statusType='status5';
 		}
 		elseif ($statut==self::STATUS_DRAFT){
 		    $labelstatut = $langs->trans('StatusOrderDraft');
 		    $labelstatutShort = $langs->trans('StatusOrderDraftShort');
-		    $statuttrans='status0';
+		    $statusType='status0';
 		}
 		elseif ($statut==self::STATUS_VALIDATED){
 		    $labelstatut = $langs->trans('StatusOrderValidated').$billedtext;
 		    $labelstatutShort = $langs->trans('StatusOrderValidatedShort').$billedtext;
-		    $statuttrans='status1';
+		    $statusType='status1';
 		}
 		elseif ($statut==self::STATUS_SHIPMENTONPROCESS){
 		    $labelstatut = $langs->trans('StatusOrderSentShort').$billedtext;
 		    $labelstatutShort = $langs->trans('StatusOrderSentShort').$billedtext;
-		    $statuttrans='status3';
+		    $statusType='status3';
 		}
 		elseif ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))){
 		    $labelstatut = $langs->trans('StatusOrderToBill');
 		    $labelstatutShort = $langs->trans('StatusOrderToBillShort');
-		    $statuttrans='status4';
+		    $statusType='status4';
 		}
 		elseif ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))){
 		    $labelstatut = $langs->trans('StatusOrderProcessed').$billedtext;
 		    $labelstatutShort = $langs->trans('StatusOrderProcessed').$billedtext;
-		    $statuttrans='status6';
+		    $statusType='status6';
 		}
 		elseif ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))){
 		    $labelstatut = $langs->trans('StatusOrderDelivered');
 		    $labelstatutShort = $langs->trans('StatusOrderDelivered');
-		    $statuttrans='status6';
+		    $statusType='status6';
 		}
 		else{
 		    $labelstatut = $langs->trans('Unknown');
 		    $labelstatutShort = '';
-		    $statuttrans='';
+		    $statusType='';
 		    $mode = 0;
 		}
 		
-		return dolGetStatus($labelstatut, $labelstatutShort, '', $statuttrans, $mode);
+		return dolGetStatus($labelstatut, $labelstatutShort, '', $statusType, $mode);
 	}
 
 
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 5926f954a46..ec2f539369f 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -469,118 +469,55 @@ abstract class CommonInvoice extends CommonObject
 		global $langs;
 		$langs->load('bills');
 
-		//print "$paye,$status,$mode,$alreadypaid,$type";
-		if ($mode == 0) {
-			$prefix='';
-			if (! $paye) {
-				if ($status == 0) return $langs->trans('Bill'.$prefix.'StatusDraft');
-				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusClosedUnpaid');
-				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return $langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
-				elseif ($alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusNotPaid');
-				else return $langs->trans('Bill'.$prefix.'StatusStarted');
-			}
-			else
-			{
-				if ($type == self::TYPE_CREDIT_NOTE) return $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');       // credit note
-				elseif ($type == self::TYPE_DEPOSIT) return $langs->trans('Bill'.$prefix.'StatusConverted');             // deposit invoice
-				else return $langs->trans('Bill'.$prefix.'StatusPaid');
-			}
+		$statusType='status0';
+		$prefix='Short';
+		if (! $paye){
+		    if ($status == 0){
+		        $labelstatut = $langs->trans('BillStatusDraft');
+		        $labelstatutShort = $langs->trans('Bill'.$prefix.'StatusDraft');
+		    }
+		    elseif (($status == 3 || $status == 2) && $alreadypaid <= 0){
+		        $labelstatut = $langs->trans('BillStatusClosedUnpaid');
+		        $labelstatutShort = $langs->trans('Bill'.$prefix.'StatusClosedUnpaid');
+		        $statusType='status5';
+		    }
+		    elseif (($status == 3 || $status == 2) && $alreadypaid > 0){
+		        $labelstatut = $langs->trans('BillStatusClosedPaidPartially');
+		        $labelstatutShort = $langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
+		        $statusType='status9';
+		    }
+		    elseif ($alreadypaid <= 0){
+		        $labelstatut = $langs->trans('BillStatusNotPaid');
+		        $labelstatutShort = $langs->trans('Bill'.$prefix.'StatusNotPaid');
+		        $statusType='status1';
+		    }
+		    else{
+		        $labelstatut = $langs->trans('BillStatusStarted');
+		        $labelstatutShort = $langs->trans('Bill'.$prefix.'StatusStarted');
+		        $statusType='status3';
+		    }
 		}
-		elseif ($mode == 1)
+		else
 		{
-			$prefix='Short';
-			if (! $paye)
-			{
-				if ($status == 0) return $langs->trans('Bill'.$prefix.'StatusDraft');
-				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusCanceled');
-				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return $langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
-				elseif ($alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusNotPaid');
-				else return $langs->trans('Bill'.$prefix.'StatusStarted');
-			}
-			else
-			{
-				if ($type == self::TYPE_CREDIT_NOTE) return $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');
-				elseif ($type == self::TYPE_DEPOSIT) return $langs->trans('Bill'.$prefix.'StatusConverted');
-				else return $langs->trans('Bill'.$prefix.'StatusPaid');
-			}
-		}
-		elseif ($mode == 2)
-		{
-			$prefix='Short';
-			if (! $paye)
-			{
-				if ($status == 0) return img_picto($langs->trans('BillStatusDraft'), 'statut0').' '.$langs->trans('Bill'.$prefix.'StatusDraft');
-				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('StatusCanceled'), 'statut5').' '.$langs->trans('Bill'.$prefix.'StatusCanceled');
-				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'), 'statut9').' '.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
-				elseif ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'), 'statut1').' '.$langs->trans('Bill'.$prefix.'StatusNotPaid');
-				else return img_picto($langs->trans('BillStatusStarted'), 'statut3').' '.$langs->trans('Bill'.$prefix.'StatusStarted');
-			}
-			else
-			{
-				if ($type == self::TYPE_CREDIT_NOTE) return img_picto($langs->trans('BillStatusPaidBackOrConverted'), 'statut6').' '.$langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');
-				elseif ($type == self::TYPE_DEPOSIT) return img_picto($langs->trans('BillStatusConverted'), 'statut6').' '.$langs->trans('Bill'.$prefix.'StatusConverted');
-				else return img_picto($langs->trans('BillStatusPaid'), 'statut6').' '.$langs->trans('Bill'.$prefix.'StatusPaid');
-			}
-		}
-		elseif ($mode == 3)
-		{
-			$prefix='Short';
-			if (! $paye)
-			{
-				if ($status == 0) return img_picto($langs->trans('BillStatusDraft'), 'statut0');
-				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('BillStatusCanceled'), 'statut5');
-				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'), 'statut9');
-				elseif ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'), 'statut1');
-				else return img_picto($langs->trans('BillStatusStarted'), 'statut3');
-			}
-			else
-			{
-				if ($type == self::TYPE_CREDIT_NOTE) return img_picto($langs->trans('BillStatusPaidBackOrConverted'), 'statut6');
-				elseif ($type == self::TYPE_DEPOSIT) return img_picto($langs->trans('BillStatusConverted'), 'statut6');
-				else return img_picto($langs->trans('BillStatusPaid'), 'statut6');
-			}
-		}
-		elseif ($mode == 4)
-		{
-			$prefix='';
-			if (! $paye)
-			{
-				if ($status == 0) return img_picto($langs->trans('BillStatusDraft'), 'statut0').' '.$langs->trans('BillStatusDraft');
-				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('BillStatusCanceled'), 'statut5').' '.$langs->trans('Bill'.$prefix.'StatusCanceled');
-				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'), 'statut9').' '.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
-				elseif ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'), 'statut1').' '.$langs->trans('BillStatusNotPaid');
-				else return img_picto($langs->trans('BillStatusStarted'), 'statut3').' '.$langs->trans('BillStatusStarted');
-			}
-			else
-			{
-				if ($type == self::TYPE_CREDIT_NOTE) return img_picto($langs->trans('BillStatusPaidBackOrConverted'), 'statut6').' '.$langs->trans('BillStatusPaidBackOrConverted');
-				elseif ($type == self::TYPE_DEPOSIT) return img_picto($langs->trans('BillStatusConverted'), 'statut6').' '.$langs->trans('BillStatusConverted');
-				else return img_picto($langs->trans('BillStatusPaid'), 'statut6').' '.$langs->trans('BillStatusPaid');
-			}
-		}
-		elseif ($mode == 5 || $mode == 6)
-		{
-			$prefix='';
-			if ($mode == 5) $prefix='Short';
-			if (! $paye)
-			{
-				if ($status == 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusDraft').' </span>'.img_picto($langs->trans('BillStatusDraft'), 'statut0');
-				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusCanceled').' </span>'.img_picto($langs->trans('BillStatusCanceled'), 'statut5');
-				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially').' </span>'.img_picto($langs->trans('BillStatusClosedPaidPartially'), 'statut9');
-				elseif ($alreadypaid <= 0)
-				{
-				    if ($type == self::TYPE_CREDIT_NOTE) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusNotRefunded').' </span>'.img_picto($langs->trans('StatusNotRefunded'), 'statut1');
-				    return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusNotPaid').' </span>'.img_picto($langs->trans('BillStatusNotPaid'), 'statut1');
-				}
-				else return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusStarted').' </span>'.img_picto($langs->trans('BillStatusStarted'), 'statut3');
-			}
-			else
-			{
-				if ($type == self::TYPE_CREDIT_NOTE) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted').' </span>'.img_picto($langs->trans('BillStatusPaidBackOrConverted'), 'statut6');
-				elseif ($type == self::TYPE_DEPOSIT) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusConverted').' </span>'.img_picto($langs->trans('BillStatusConverted'), 'statut6');
-				else return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusPaid').' </span>'.img_picto($langs->trans('BillStatusPaid'), 'statut6');
-			}
+		    $statusType='status6';
+		    
+		    if ($type == self::TYPE_CREDIT_NOTE){
+		        $labelstatut = $langs->trans('BillStatusPaidBackOrConverted');       // credit note
+		        $labelstatutShort = $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');       // credit note
+		    }
+		    elseif ($type == self::TYPE_DEPOSIT){
+		        $labelstatut = $langs->trans('BillStatusConverted');             // deposit invoice
+		        $labelstatutShort = $langs->trans('Bill'.$prefix.'StatusConverted');             // deposit invoice
+		    }
+		    else{
+		        $labelstatut = $langs->trans('BillStatusPaid');
+		        $labelstatutShort = $langs->trans('Bill'.$prefix.'StatusPaid');
+		    }
 		}
+		
+		
+		return dolGetStatus($labelstatut, $labelstatutShort, '', $statusType, $mode);
+		
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps