From ee3dcb724fe98c683812b0992b1b2df101f2ffdf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Mar 2018 17:20:44 +0100
Subject: [PATCH] FIX email use the validate user instead of approver in
 holiday approval email.

---
 htdocs/expensereport/card.php                     |  2 +-
 .../expensereport/class/expensereport.class.php   | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 34b78e4eb80..01f7ee0c838 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -591,7 +591,7 @@ if (empty($reshook))
 
 			// FROM
    			$expediteur = new User($db);
-   			$expediteur->fetch($object->fk_user_valid);
+   			$expediteur->fetch($object->fk_user_approve > 0 ? $object->fk_user_approve : $object->fk_user_validator);
    			$emailFrom = $expediteur->email;
 
    			if ($emailFrom && $emailTo)
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 6bbd45eef14..9f51b04a1f1 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -44,7 +44,6 @@ class ExpenseReport extends CommonObject
 
     public $date_fin;
 
-    var $fk_user_validator;
     var $status;
     var $fk_statut;     // -- 0=draft, 2=validated (attente approb), 4=canceled, 5=approved, 6=payed, 99=denied
     var $fk_c_paiement;
@@ -78,14 +77,16 @@ class ExpenseReport extends CommonObject
     var $detail_cancel;
     var $fk_user_cancel;
 
+    var $fk_user_validator;	// User that is defined to approve
+
     // Validation
-    var $date_valid;
+    var $date_valid;		// User making validation
     var $fk_user_valid;
     var $user_valid_infos;
 
     // Approve
     var $date_approve;
-    var $fk_user_approve;
+    var $fk_user_approve;	// User that has approved
 
     // Paiement
     var $user_paid_infos;
@@ -179,6 +180,7 @@ class ExpenseReport extends CommonObject
         $sql.= ",date_create";
         $sql.= ",fk_user_author";
         $sql.= ",fk_user_validator";
+        $sql.= ",fk_user_approve";
         $sql.= ",fk_user_modif";
         $sql.= ",fk_statut";
         $sql.= ",fk_c_paiement";
@@ -196,6 +198,7 @@ class ExpenseReport extends CommonObject
         $sql.= ", '".$this->db->idate($now)."'";
         $sql.= ", ".$fuserid;
         $sql.= ", ".($this->fk_user_validator > 0 ? $this->fk_user_validator:"null");
+        $sql.= ", ".($this->fk_user_approve > 0 ? $this->fk_user_approve:"null");
         $sql.= ", ".($this->fk_user_modif > 0 ? $this->fk_user_modif:"null");
         $sql.= ", ".($this->fk_statut > 1 ? $this->fk_statut:0);
         $sql.= ", ".($this->modepaymentid?$this->modepaymentid:"null");
@@ -391,6 +394,7 @@ class ExpenseReport extends CommonObject
         }
         $sql.= " , fk_user_validator = ".($this->fk_user_validator > 0 ? $this->fk_user_validator:"null");
         $sql.= " , fk_user_valid = ".($this->fk_user_valid > 0 ? $this->fk_user_valid:"null");
+        $sql.= " , fk_user_approve = ".($this->fk_user_approve > 0 ? $this->fk_user_approve:"null");
         $sql.= " , fk_user_modif = ".$user->id;
         $sql.= " , fk_statut = ".($this->fk_statut >= 0 ? $this->fk_statut:'0');
         $sql.= " , fk_c_paiement = ".($this->fk_c_paiement > 0 ? $this->fk_c_paiement:"null");
@@ -500,7 +504,8 @@ class ExpenseReport extends CommonObject
                 $this->user_author_infos = dolGetFirstLastname($user_author->firstname, $user_author->lastname);
 
                 $user_approver = new User($this->db);
-                if ($this->fk_user_validator > 0) $user_approver->fetch($this->fk_user_validator);
+                if ($this->fk_user_approve > 0) $user_approver->fetch($this->fk_user_approve);
+                elseif ($this->fk_user_validator > 0) $user_approver->fetch($this->fk_user_validator);		// For backward compatibility
                 $this->user_validator_infos = dolGetFirstLastname($user_approver->firstname, $user_approver->lastname);
 
                 $this->fk_statut                = $obj->status;
@@ -749,9 +754,9 @@ class ExpenseReport extends CommonObject
         $this->fk_statut = 5;
 
         $this->fk_user_author = $user->id;
+        $this->fk_user_validator = $user->id;
         $this->fk_user_valid = $user->id;
         $this->fk_user_approve = $user->id;
-        $this->fk_user_validator = $user->id;
 
         $this->note_private='Private note';
         $this->note_public='SPECIMEN';