Merge remote-tracking branch 'upstream/develop' into 18a5

htdocs/install/mysql/migration/17.0.0-18.0.0.sql

@@ -388,3 +388,7 @@ ALTER TABLE llx_bordereau_cheque ADD COLUMN label varchar(255) AFTER ref;
 
 ALTER TABLE llx_societe ADD COLUMN vat_reverse_charge tinyint DEFAULT 0 AFTER tva_assuj;
 ALTER TABLE llx_facture_fourn ADD COLUMN vat_reverse_charge tinyint DEFAULT 0 AFTER close_note;
+
+ALTER TABLE llx_c_email_templates add COLUMN defaultfortype smallint DEFAULT 0;
+
+ALTER TABLE llx_mailing ADD COLUMN evenunsubscribe smallint DEFAULT 0;

htdocs/install/mysql/tables/llx_c_email_templates.sql

@@ -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

htdocs/install/mysql/tables/llx_mailing-mailing.sql

@@ -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