diff --git a/htdocs/install/mysql/migration/2.9.0-3.0.0.sql b/htdocs/install/mysql/migration/2.9.0-3.0.0.sql index 4184a5fa6fb..085d0b1db75 100644 --- a/htdocs/install/mysql/migration/2.9.0-3.0.0.sql +++ b/htdocs/install/mysql/migration/2.9.0-3.0.0.sql @@ -43,6 +43,7 @@ ALTER TABLE llx_expedition MODIFY date_expedition datetime; ALTER TABLE llx_expedition MODIFY date_delivery datetime NULL; ALTER TABLE llx_societe ADD COLUMN canvas varchar(32) DEFAULT NULL AFTER default_lang; +ALTER TABLE llx_societe MODIFY canvas varchar(32) DEFAULT NULL; ALTER TABLE llx_cond_reglement RENAME TO llx_c_payment_term; ALTER TABLE llx_expedition_methode RENAME TO llx_c_shipment_mode; @@ -93,8 +94,8 @@ CREATE TABLE llx_c_ziptown ALTER TABLE llx_c_ziptown ADD INDEX idx_c_ziptown_fk_county (fk_county); ALTER TABLE llx_c_ziptown ADD CONSTRAINT fk_c_ziptown_fk_county FOREIGN KEY (fk_county) REFERENCES llx_c_departements (rowid); -ALTER TABLE llx_socpeople ADD COLUMN canvas varchar(32) DEFAULT 'default' after default_lang; -ALTER TABLE llx_socpeople MODIFY canvas varchar(32) DEFAULT 'default'; +ALTER TABLE llx_socpeople ADD COLUMN canvas varchar(32) DEFAULT NULL after default_lang; +ALTER TABLE llx_socpeople MODIFY canvas varchar(32) DEFAULT NULL; UPDATE llx_socpeople SET canvas = 'default' WHERE canvas = 'default@contact'; UPDATE llx_societe SET canvas = 'default' WHERE canvas = 'default@thirdparty'; diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql index 4dc1a835250..d2168585a90 100644 --- a/htdocs/install/mysql/tables/llx_societe.sql +++ b/htdocs/install/mysql/tables/llx_societe.sql @@ -81,6 +81,6 @@ create table llx_societe gencod varchar(255), -- barcode price_level integer NULL, -- level of price for multiprices default_lang varchar(6), -- default language - canvas varchar(32) DEFAULT 'default', -- type of canvas + canvas varchar(32), -- type of canvas if used (null by default) import_key varchar(14) -- import key )type=innodb; diff --git a/htdocs/install/mysql/tables/llx_socpeople.sql b/htdocs/install/mysql/tables/llx_socpeople.sql index eb39de0ce6d..efe3d496456 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.sql @@ -48,6 +48,6 @@ create table llx_socpeople fk_user_modif integer, note text, default_lang varchar(6), - canvas varchar(32) DEFAULT 'default', -- type of canvas + canvas varchar(32), -- type of canvas if used (null by default) import_key varchar(14) )type=innodb;