From 471a947e8abe8789fc49da2ed99c679cedd4349d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 26 Jul 2019 16:30:16 +0200
Subject: [PATCH] FIX Attachment was lost when we validate an expense report

Conflicts:
	htdocs/expensereport/class/expensereport.class.php
---
 htdocs/expensereport/class/expensereport.class.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index dd2818f28bf..aec06b7972b 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -1120,11 +1120,10 @@ class ExpenseReport extends CommonObject
         $resql=$this->db->query($sql);
         if ($resql)
         {
-			if (!$notrigger)
+			if (! $error && ! $notrigger)
 			{
 				// Call trigger
-				$result=$this->call_trigger('EXPENSE_REPORT_VALIDATE',$fuser);
-
+				$result=$this->call_trigger('EXPENSE_REPORT_VALIDATE', $fuser);
 				if ($result < 0) {
 					$error++;
 				}
@@ -1148,7 +1147,7 @@ class ExpenseReport extends CommonObject
 					$dirdest = $conf->expensereport->dir_output.'/'.$newref;
 					if (file_exists($dirsource))
 					{
-					    dol_syslog(get_class($this)."::valid() rename dir ".$dirsource." into ".$dirdest);
+					    dol_syslog(get_class($this)."::setValidate() rename dir ".$dirsource." into ".$dirdest);
 
 					    if (@rename($dirsource, $dirdest))
 					    {