From a279451241805d401e4d04b2d7d47bd1e650e2e1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 17 May 2018 17:58:29 +0200 Subject: [PATCH] Fix can use actionmsg for generic trigger --- htdocs/core/class/html.formsms.class.php | 2 +- .../core/triggers/interface_50_modAgenda_ActionsAuto.class.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/html.formsms.class.php b/htdocs/core/class/html.formsms.class.php index 103b40e33df..6db6f200136 100644 --- a/htdocs/core/class/html.formsms.class.php +++ b/htdocs/core/class/html.formsms.class.php @@ -213,7 +213,7 @@ function limitChars(textarea, limit, infodiv) else { $sms = new stdClass(); - $sms->error='The SMS manager '.$classfile.' defined into SMS setup MAIN_SMS_SENDMODE is not found'; + $sms->error='The SMS manager "'.$classfile.'" defined into SMS setup MAIN_SMS_SENDMODE is not found'; } } catch(Exception $e) diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php index 2301b1642b4..481df585f3a 100644 --- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php +++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php @@ -809,7 +809,7 @@ class InterfaceActionsAuto extends DolibarrTriggers $langs->load("other"); if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities($action."InDolibarr",$object->ref); - $object->actionmsg=$langs->transnoentities($action."InDolibarr",$object->ref); + if (empty($object->actionmsg)) $object->actionmsg=$langs->transnoentities($action."InDolibarr",$object->ref); $object->sendtoid=0; }