From 9c823a731050f28a762815f2aac37494a233fff5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 23 Jan 2011 22:26:10 +0000 Subject: [PATCH] Fix: use canvas when option not enabled --- htdocs/install/mysql/migration/2.9.0-3.0.0.sql | 4 ++-- htdocs/install/mysql/tables/llx_societe.sql | 2 +- htdocs/install/mysql/tables/llx_socpeople.sql | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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..001550d7f7a 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 @@ -93,8 +93,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..3775ae3e19b 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;