Prepare table for email templates.

Dolibarr · Aug 5, 2014 · f863604 · f863604
1 parent 164c9e0
commit f863604
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 17 deletions.
diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
@@ -925,21 +925,20 @@ DROP TABLE llx_texts;
 
 
 DROP TABLE llx_c_email_templates;
-CREATE table llx_c_email_templates
+create table llx_c_email_templates
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   entity		  integer DEFAULT 1 NOT NULL,	  -- multi company id
-  module          varchar(32),                   -- Nom du module en rapport avec le modele
+  module          varchar(32),                    -- Nom du module en rapport avec le modele
   type_template   varchar(32),  				  -- template for which type of email (send invoice by email, send order, ...)
-  sortorder       smallint,					  -- Ordre affichage
-
-  private         smallint DEFAULT 0 NOT NULL, -- Template public or private
-  fk_user         integer,                       -- Id utilisateur si modele prive, sinon null
+  private         smallint DEFAULT 0 NOT NULL,    -- Template public or private
+  fk_user         integer,                        -- Id utilisateur si modele prive, sinon null
   datec           datetime,
   tms             timestamp,
-
-  label           varchar(255),
-  content         text
+  label           varchar(255),					  -- Label of predefined email
+  position        smallint,					      -- Position
+  topic			  text,                           -- Predefined topic
+  content         text                            -- Predefined text
 )ENGINE=innodb;
 
 

diff --git a/htdocs/install/mysql/tables/llx_c_email_template.sql b/htdocs/install/mysql/tables/llx_c_email_template.sql
@@ -21,15 +21,14 @@ create table llx_c_email_templates
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   entity		  integer DEFAULT 1 NOT NULL,	  -- multi company id
-  module          varchar(32),                   -- Nom du module en rapport avec le modele
+  module          varchar(32),                    -- Nom du module en rapport avec le modele
   type_template   varchar(32),  				  -- template for which type of email (send invoice by email, send order, ...)
-  sortorder       smallint,					  -- Ordre affichage
-
-  private         smallint DEFAULT 0 NOT NULL, -- Template public or private
-  fk_user         integer,                       -- Id utilisateur si modele prive, sinon null
+  private         smallint DEFAULT 0 NOT NULL,    -- Template public or private
+  fk_user         integer,                        -- Id utilisateur si modele prive, sinon null
   datec           datetime,
   tms             timestamp,
-
-  label           varchar(255),
-  content         text
+  label           varchar(255),					  -- Label of predefined email
+  position        smallint,					      -- Position
+  topic			  text,                           -- Predefined topic
+  content         text                            -- Predefined text
 )ENGINE=innodb;