From 4eddee5b4d55b41edaeaa9e28adbe8cdc760e98e Mon Sep 17 00:00:00 2001 From: thibdrev Date: Fri, 15 Dec 2023 14:18:43 +0100 Subject: [PATCH 1/3] add ErrorStartDateGreaterEnd to /en_US/errors.lang --- htdocs/langs/en_US/errors.lang | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang index 51b550f9480..8896bfa5a75 100644 --- a/htdocs/langs/en_US/errors.lang +++ b/htdocs/langs/en_US/errors.lang @@ -151,6 +151,7 @@ ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database ser ErrorFailedToAddContact=Failed to add contact ErrorDateMustBeBeforeToday=The date must be lower than today ErrorDateMustBeInFuture=The date must be greater than today +ErrorStartDateGreaterEnd=The start date is greater than the end date ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode. ErrorPHPNeedModule=Error, your PHP must have module %s installed to use this feature. ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s From 2245ea09d46e9ceed26df9e4a12edd0d19f07409 Mon Sep 17 00:00:00 2001 From: thibdrev Date: Fri, 15 Dec 2023 14:24:00 +0100 Subject: [PATCH 2/3] add ErrorStartDateGreaterEnd to /fr_FR/errors.lang --- htdocs/langs/fr_FR/errors.lang | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang index 1cecc490b36..84fbfaf4a21 100644 --- a/htdocs/langs/fr_FR/errors.lang +++ b/htdocs/langs/fr_FR/errors.lang @@ -151,6 +151,7 @@ ErrorToConnectToMysqlCheckInstance=Echec de la connection au serveur de base de ErrorFailedToAddContact=Echec à l'ajout du contact ErrorDateMustBeBeforeToday=La date doit être inférieure à la date courante ErrorDateMustBeInFuture=La date doit être postérieure à la date courante +ErrorStartDateGreaterEnd=La date de début est postérieure à la date de fin ErrorPaymentModeDefinedToWithoutSetup=Un mode de paiement a été défini de type %s mais la configuration du module Facture n'a pas été complétée pour définir les informations affichées pour ce mode de paiement. ErrorPHPNeedModule=Erreur, votre PHP doit avoir le module %s installé pour utiliser cette fonctionnalité. ErrorOpenIDSetupNotComplete=Vous avez configuré Dolibarr pour accepter l'authentication OpenID, mais l'URL du service OpenID n'est pas défini dans la constante %s From 4dcd7955ef9314055377fcb38d27c196e9c293c4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 18 Dec 2023 17:42:17 +0100 Subject: [PATCH 3/3] FIX Error on emailreminder not reported --- htdocs/comm/action/card.php | 5 +++++ htdocs/comm/action/class/actioncomm.class.php | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 2b3aae73a4d..365e45a2f5e 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -2447,6 +2447,7 @@ if ($id > 0) { print ' ('.$tmpuserstatic->getNomUrl(0, '', 0, 0, 16).')'; } print ' - '.$actioncommreminder->offsetvalue.' '.$TDurationTypes[$actioncommreminder->offsetunit]; + if ($actioncommreminder->status == $actioncommreminder::STATUS_TODO) { print ' - '; print $langs->trans("NotSent"); @@ -2455,6 +2456,10 @@ if ($id > 0) { print ' - '; print $langs->trans("Done"); print ' '; + } elseif ($actioncommreminder->status == $actioncommreminder::STATUS_ERROR) { + print ' - '; + print $form->textwithpicto($langs->trans("Error"), $actioncommreminder->lasterror); + print ' '; } print '
'; } diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 69bc112e081..75a7638f676 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -2414,7 +2414,7 @@ class ActionComm extends CommonObject $this->reminders = array(); //Select all action comm reminders for event - $sql = "SELECT rowid as id, typeremind, dateremind, status, offsetvalue, offsetunit, fk_user"; + $sql = "SELECT rowid as id, typeremind, dateremind, status, offsetvalue, offsetunit, fk_user, fk_email_template, lasterror"; $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm_reminder"; $sql .= " WHERE fk_actioncomm = ".((int) $this->id); if ($onlypast) { @@ -2446,6 +2446,8 @@ class ActionComm extends CommonObject $tmpactioncommreminder->offsetunit = $obj->offsetunit; $tmpactioncommreminder->status = $obj->status; $tmpactioncommreminder->fk_user = $obj->fk_user; + $tmpactioncommreminder->fk_email_template = $obj->fk_email_template; + $tmpactioncommreminder->lasterror = $obj->lasterror; $this->reminders[$obj->id] = $tmpactioncommreminder; }