diff --git a/htdocs/actioncomm.class.php b/htdocs/actioncomm.class.php index 3fd80919ac94503a2c1e78b951aa5019bcb50345..04bc9bbc8fd7f4c44e3790b7d77b5a5a9ea48ee8 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 b936dd9ce4ac1f28235fff5490e55ba396a08751..776410ef8b35c3d9ed3e9aa58f8101bcaffa5eb5 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 7fb9d05a2786b9f7cf262747aa9dfd6c9bf4c44f..942d7d1a7ef41e2328fc968384b84b5680f39e14 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 b375385448db5c8faa583db6b9bf669f87a49941..d7b6143490e56411cfadfb24b904401dcd82f014 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