Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-10 19:41:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add fk_email_template

Browse Source
This commit is contained in:
atm-lena
2020-08-26 16:06:20 +02:00
parent cf9337b644
commit a01d1b58c7
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/action/card.php
View File

@@ -1180,7 +1180,7 @@ if ($action == 'create')
print '</td></tr>'; print '</td></tr>';
//Mail Model //Mail Model
print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("Model").'</td><td colspan="3">'; print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("EMailTemplates").'</td><td colspan="3">';
print $form->select_model_mail('eventpush', 'event_push'); print $form->select_model_mail('eventpush', 'event_push');
print '</td></tr>'; print '</td></tr>';

6
htdocs/comm/action/class/actioncommreminder.class.php
View File

@@ -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",), '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')), '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_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; public $fk_project;
/**
* @var int Template Mail
*/
public $fk_email_template;
const STATUS_TODO = 0; const STATUS_TODO = 0;
const STATUS_DONE = 1; const STATUS_DONE = 1;

1
htdocs/install/mysql/migration/12.0.0-13.0.0.sql
View File

@@ -283,3 +283,4 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
ALTER TABLE llx_actioncomm_reminder ADD COLUMN entity integer NOT NULL DEFAULT 1; 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; ALTER TABLE llx_actioncomm_reminder ADD COLUMN fk_project integer NOT NULL;
ALTER TABLE llx_actioncomm_reminder ADD COLUMN fk_email_template integer;