From 8c90c801074e19c65a06327c417d8d1eb29ee33c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 2 Nov 2019 01:30:51 +0100
Subject: [PATCH] Clean code

---
 htdocs/don/class/paymentdonation.class.php         | 1 -
 htdocs/expensereport/card.php                      | 4 ++--
 htdocs/expensereport/class/expensereport.class.php | 6 ++----
 htdocs/expensereport/index.php                     | 1 -
 htdocs/loan/class/paymentloan.class.php            | 2 --
 5 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/htdocs/don/class/paymentdonation.class.php b/htdocs/don/class/paymentdonation.class.php
index 3c5404366de..dbe9702ba0c 100644
--- a/htdocs/don/class/paymentdonation.class.php
+++ b/htdocs/don/class/paymentdonation.class.php
@@ -633,7 +633,6 @@ class PaymentDonation extends CommonObject
 
 		$result='';
 
-		if (empty($this->ref)) $this->ref=$this->lib;
         $label = $langs->trans("ShowPayment").': '.$this->ref;
 
 		if (!empty($this->id))
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 7a62903dfe6..0f7242442fe 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1506,7 +1506,7 @@ if ($action == 'create')
 		print '<tr>';
 		print '<td>'.$langs->trans("ModePaiement").'</td>';
 		print '<td>';
-		$form->select_types_paiements(2, 'fk_c_paiement');
+		$form->select_types_paiements('', 'fk_c_paiement');
 		print '</td>';
 		print '</tr>';
 	}
@@ -1832,7 +1832,7 @@ else
 				{
 					print '<tr>';
 					print '<td>'.$langs->trans("ModePaiement").'</td>';
-					print '<td>'.$object->libelle_paiement.'</td>';
+					print '<td>'.$object->fk_c_paiement.'</td>';
 					print '</tr>';
 				}
 
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index fffde04ac3d..958a9c38e8b 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -511,7 +511,7 @@ class ExpenseReport extends CommonObject
         $sql.= " d.fk_user_author, d.fk_user_modif, d.fk_user_validator,";
         $sql.= " d.fk_user_valid, d.fk_user_approve,";
         $sql.= " d.fk_statut as status, d.fk_c_paiement, d.paid,";
-        $sql.= " dp.libelle as libelle_paiement, dp.code as code_paiement";                             // INNER JOIN paiement
+        $sql.= " dp.libelle as label_payment, dp.code as code_paiement";                             // INNER JOIN paiement
         $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as d";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as dp ON d.fk_c_paiement = dp.id";
         if ($ref) $sql.= " WHERE d.ref = '".$this->db->escape($ref)."'";
@@ -567,15 +567,13 @@ class ExpenseReport extends CommonObject
                 $this->fk_c_paiement            = $obj->fk_c_paiement;
                 $this->paid                     = $obj->paid;
 
-                if ($this->fk_statut==5 || $this->fk_statut==6)
+                if ($this->fk_statut == self::STATUS_APPROVED || $this->fk_statut == self::STATUS_CLOSED)
                 {
                     $user_valid = new User($this->db);
                     if ($this->fk_user_valid > 0) $user_valid->fetch($this->fk_user_valid);
                     $this->user_valid_infos = dolGetFirstLastname($user_valid->firstname, $user_valid->lastname);
                 }
 
-                $this->libelle_statut   = $obj->libelle_statut;
-                $this->libelle_paiement = $obj->libelle_paiement;
                 $this->code_statut      = $obj->code_statut;
                 $this->code_paiement    = $obj->code_paiement;
 
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index aaffc878046..83d60990b4e 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -221,7 +221,6 @@ if ($result)
             print '<td class="right">'.price($obj->total_ttc).'</td>';
             print '<td class="right">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>';
             print '<td class="right">';
-            //print $obj->libelle;
 			print $expensereportstatic->LibStatut($obj->fk_status, 3);
             print '</td>';
             print '</tr>';
diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php
index c938fe92c80..d3c497cbbae 100644
--- a/htdocs/loan/class/paymentloan.class.php
+++ b/htdocs/loan/class/paymentloan.class.php
@@ -545,8 +545,6 @@ class PaymentLoan extends CommonObject
 
 		$result='';
 
-		if (empty($this->ref)) $this->ref=$this->lib;
-
 		if (!empty($this->id))
 		{
 			$link = '<a href="'.DOL_URL_ROOT.'/loan/payment/card.php?id='.$this->id.'">';