diff --git a/htdocs/actioncomm.class.php b/htdocs/actioncomm.class.php index 3fd80919ac9..04bc9bbc8fd 100644 --- a/htdocs/actioncomm.class.php +++ b/htdocs/actioncomm.class.php @@ -231,11 +231,13 @@ class ActionComm $this->id = $obj->id; $this->ref = $obj->id; + $this->type_id = $obj->type_id; $this->type_code = $obj->type_code; $transcode=$langs->trans("Action".$obj->code); $type_libelle=($transcode!="Action".$obj->code?$transcode:$obj->libelle); $this->type = $type_libelle; + $this->label = $obj->label; $this->datep = $obj->datep; $this->datef = $obj->datep2; diff --git a/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php b/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php index b936dd9ce4a..776410ef8b3 100644 --- a/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php +++ b/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php @@ -116,7 +116,7 @@ class InterfaceActionsAuto $ok=0; // Actions - if ($action == 'COMPANY_CREATE') + if ($action == 'COMPANY_CREATE') { dolibarr_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); $langs->load("other"); diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang index 7fb9d05a278..942d7d1a7ef 100644 --- a/htdocs/langs/en_US/agenda.lang +++ b/htdocs/langs/en_US/agenda.lang @@ -26,7 +26,7 @@ ViewWithPredefinedFilters = View with predefined filters AutoActions = Automatic filling of agenda AgendaAutoActionDesc = Define here events for which you want Dolibarr to create automatically an action in agenda. If nothing is checked (by default), only manual actions will be included in agenda. AgendaSetupOtherDesc = This page allows to configure other parameters of agenda module. -ActionsEvents = Events for which create an action +ActionsEvents = Events for which Dolibarr will create an action in agenda automatically PropalValidatedInDolibarr = Proposal validated InvoiceValidatedInDolibarr = Invoice validated OrderValidatedInDolibarr = Order validated diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang index b375385448d..d7b6143490e 100644 --- a/htdocs/langs/fr_FR/agenda.lang +++ b/htdocs/langs/fr_FR/agenda.lang @@ -26,7 +26,7 @@ ViewWithPredefinedFilters=Vues avec filtres pr AutoActions=Alimentation automatique de l'agenda AgendaAutoActionDesc=Définissez dans cet onglet les évènements pour lesquels dolibarr créera automatiquement une action dans l'agenda. Si aucune case n'est cochée (par défaut), seules les actions manuelles seront incluses dans l'agenda. AgendaSetupOtherDesc=Cette page permet de configurer les autres paramètres du module agenda. -ActionsEvents=Evènements pour lesquels creer une action +ActionsEvents=Evènements pour lesquels Dolibarr doit créer une action dans l'agenda en automatique. PropalValidatedInDolibarr=Proposition validée InvoiceValidatedInDolibarr=Facture validée OrderValidatedInDolibarr=Commande validée