From 9e562537047b1c46c9bfd5bb36872684d87ebad1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 25 Nov 2020 18:37:03 +0100 Subject: [PATCH 1/2] Update expensereport.class.php --- htdocs/expensereport/class/expensereport.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php index 6f6f4bbd010..bfe7857eb4e 100644 --- a/htdocs/expensereport/class/expensereport.class.php +++ b/htdocs/expensereport/class/expensereport.class.php @@ -1091,7 +1091,7 @@ class ExpenseReport extends CommonObject if (!$notrigger) { // Call trigger - $result = $this->call_trigger('EXPENSEREPORT_DELETE', $user); + $result = $this->call_trigger('EXPENSEREPORT_DELETE', $fuser); if ($result < 0) { $error++; } // End call triggers } From c1a1d4330a21426f99abaa2a8dcd7122cd45f5dd Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 25 Nov 2020 19:55:11 +0100 Subject: [PATCH 2/2] Update expensereport.class.php --- htdocs/expensereport/class/expensereport.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php index bfe7857eb4e..84672d90974 100644 --- a/htdocs/expensereport/class/expensereport.class.php +++ b/htdocs/expensereport/class/expensereport.class.php @@ -1076,11 +1076,11 @@ class ExpenseReport extends CommonObject /** * Delete object in database * - * @param User $fuser User that delete + * @param User $user User that delete * @param bool $notrigger false=launch triggers after, true=disable triggers * @return int <0 if KO, >0 if OK */ - public function delete(User $fuser = null, $notrigger = false) + public function delete(User $user = null, $notrigger = false) { global $conf; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; @@ -1091,7 +1091,7 @@ class ExpenseReport extends CommonObject if (!$notrigger) { // Call trigger - $result = $this->call_trigger('EXPENSEREPORT_DELETE', $fuser); + $result = $this->call_trigger('EXPENSEREPORT_DELETE', $user); if ($result < 0) { $error++; } // End call triggers }