forked from Wavyzz/dolibarr
Merge remote-tracking branch 'upstream/develop' into 18a5
This commit is contained in:
@@ -30,6 +30,7 @@ create table llx_c_email_templates
|
||||
tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
|
||||
label varchar(180), -- Label of predefined email
|
||||
position smallint, -- Position
|
||||
defaultfortype smallint DEFAULT 0, -- 1=Use this template by default when creating a new email for this type
|
||||
enabled varchar(255) DEFAULT '1', -- Condition to have this module visible
|
||||
active tinyint DEFAULT 1 NOT NULL,
|
||||
email_from varchar(255), -- default email from
|
||||
|
||||
@@ -33,6 +33,7 @@ create table llx_mailing
|
||||
body mediumtext,
|
||||
bgcolor varchar(8), -- Backgroud color of mailing
|
||||
bgimage varchar(255), -- Backgroud image of mailing
|
||||
evenunsubscribe smallint DEFAULT 0, -- If 1, email will be send event if recipient has opt-out to emailings
|
||||
cible varchar(60),
|
||||
nbemail integer,
|
||||
email_from varchar(160), -- Email address of sender
|
||||
|
||||
Reference in New Issue
Block a user