From 5615416d1ae8c967ae0dcfc84f93401f8d078cef Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 15 Nov 2017 11:09:18 +0100 Subject: [PATCH 1/3] better handle of errors --- htdocs/expensereport/class/expensereport.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php index b2d6f052a2a..5b138fd3b01 100644 --- a/htdocs/expensereport/class/expensereport.class.php +++ b/htdocs/expensereport/class/expensereport.class.php @@ -1525,8 +1525,8 @@ class ExpenseReport extends CommonObject } else { - print $langs->trans("Error")." ".$langs->trans("Error_EXPENSEREPORT_ADDON_NotDefined"); - return ""; + setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Error_EXPENSEREPORT_ADDON_NotDefined")), null, 'errors'); + $errors++; } } From acc2fcbddd51fba9b29ffe3d5b6b4f168e70b105 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 17 Nov 2017 13:04:33 +0100 Subject: [PATCH 2/3] 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 5b138fd3b01..1460dc2504a 100644 --- a/htdocs/expensereport/class/expensereport.class.php +++ b/htdocs/expensereport/class/expensereport.class.php @@ -1525,7 +1525,7 @@ class ExpenseReport extends CommonObject } else { - setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Error_EXPENSEREPORT_ADDON_NotDefined")), null, 'errors'); + setEventMessages($langs->transnoentitiesnoconv("Error_EXPENSEREPORT_ADDON_NotDefined"), null, 'errors'); $errors++; } } From 2077f7ad96e800b97fe2ba85fd8408c6901e07b6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 17 Nov 2017 13:09:03 +0100 Subject: [PATCH 3/3] 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 1460dc2504a..c345155c751 100644 --- a/htdocs/expensereport/class/expensereport.class.php +++ b/htdocs/expensereport/class/expensereport.class.php @@ -1520,13 +1520,13 @@ class ExpenseReport extends CommonObject $this->error=$obj->error; $this->errors=$obj->errors; //dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error); - return ""; + return -1; } } else { - setEventMessages($langs->transnoentitiesnoconv("Error_EXPENSEREPORT_ADDON_NotDefined"), null, 'errors'); - $errors++; + $this->error = "Error_EXPENSEREPORT_ADDON_NotDefined"; + return -2; } }