diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index cd550a1b8dd..18e836823e0 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -1180,7 +1180,7 @@ if ($action == 'create') print ''; //Mail Model - print ''.$langs->trans("Model").''; + print ''.$langs->trans("EMailTemplates").''; print $form->select_model_mail('eventpush', 'event_push'); print ''; diff --git a/htdocs/comm/action/class/actioncommreminder.class.php b/htdocs/comm/action/class/actioncommreminder.class.php index 58da9134a29..383acddb70c 100644 --- a/htdocs/comm/action/class/actioncommreminder.class.php +++ b/htdocs/comm/action/class/actioncommreminder.class.php @@ -82,6 +82,7 @@ class ActionCommReminder extends CommonObject 'offsetunit' => array('type'=>'varchar(1)', 'label'=>'OffsetUnit', 'visible'=>1, 'enabled'=>1, 'position'=>57, 'notnull'=>1, 'comment'=>"m, h, d, w",), 'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>58, 'notnull'=>1, 'default'=>0, 'index'=>0, 'arrayofkeyval'=>array('0'=>'ToDo', '1'=>'Done')), 'fk_project' => array('type'=>'integer', 'label'=>'Project', 'visible'=>1, 'enabled'=>1, 'position'=>59, 'notnull'=>1), + 'fk_email_template' => array('type'=>'integer', 'label'=>'Project', 'visible'=>1, 'enabled'=>1, 'position'=>59, 'notnull'=>0), ); /** @@ -115,6 +116,11 @@ class ActionCommReminder extends CommonObject */ public $fk_project; + /** + * @var int Template Mail + */ + public $fk_email_template; + const STATUS_TODO = 0; const STATUS_DONE = 1; diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql index 08b6389aac6..676655815dc 100644 --- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql +++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql @@ -282,4 +282,5 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECRUITMENTCANDIDATURE_DELETE','Candidature deleted','Executed when a candidature is deleted','recruitment',7516); ALTER TABLE llx_actioncomm_reminder ADD COLUMN entity integer NOT NULL DEFAULT 1; -ALTER TABLE llx_actioncomm_reminder ADD COLUMN fk_project integer NOT NULL; \ No newline at end of file +ALTER TABLE llx_actioncomm_reminder ADD COLUMN fk_project integer NOT NULL; +ALTER TABLE llx_actioncomm_reminder ADD COLUMN fk_email_template integer; \ No newline at end of file