Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0

This commit is contained in:
Laurent Destailleur 2023-12-19 00:49:35 +01:00
commit 5b2012dba2
4 changed files with 10 additions and 1 deletions

View file

@ -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 ' - <span class="opacitymedium">';
print $langs->trans("NotSent");
@ -2455,6 +2456,10 @@ if ($id > 0) {
print ' - <span class="opacitymedium">';
print $langs->trans("Done");
print ' </span>';
} elseif ($actioncommreminder->status == $actioncommreminder::STATUS_ERROR) {
print ' - <span class="opacitymedium">';
print $form->textwithpicto($langs->trans("Error"), $actioncommreminder->lasterror);
print ' </span>';
}
print '<br>';
}

View file

@ -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;
}

View file

@ -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 <b>%s</b> 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

View file

@ -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 <b>%s</b> 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