diff --git a/htdocs/install/mysql/migration/2.8.0-2.9.0.sql b/htdocs/install/mysql/migration/2.8.0-2.9.0.sql index 75cf5ee64d0..ea16586009d 100755 --- a/htdocs/install/mysql/migration/2.8.0-2.9.0.sql +++ b/htdocs/install/mysql/migration/2.8.0-2.9.0.sql @@ -314,3 +314,8 @@ INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, ' delete from llx_const where name='USER_PASSWORD_GENERATED' and value='default'; + +ALTER TABLE llx_boxes_def DROP INDEX uk_boxes_def; +ALTER TABLE llx_boxes_def MODIFY note varchar(255); +ALTER TABLE llx_boxes_def ADD UNIQUE INDEX uk_boxes_def (file, entity, note); + 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 33e99bd8c2e..835633d49e6 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 @@ -18,4 +18,8 @@ alter table llx_product_price add column recuperableonly integer NOT NULL DEFAUL alter table llx_product change column envente tosell tinyint DEFAULT 1; alter table llx_product add column tobuy tinyint DEFAULT 1 after tosell; alter table llx_product_price change column envente tosell tinyint DEFAULT 1; - \ No newline at end of file + + +ALTER TABLE llx_boxes_def DROP INDEX uk_boxes_def; +ALTER TABLE llx_boxes_def MODIFY note varchar(255); +ALTER TABLE llx_boxes_def ADD UNIQUE INDEX uk_boxes_def (file, entity, note); diff --git a/htdocs/install/mysql/tables/llx_boxes_def.key.sql b/htdocs/install/mysql/tables/llx_boxes_def.key.sql index 70192090600..690df4cf56a 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.key.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.key.sql @@ -20,4 +20,5 @@ -- =========================================================================== -ALTER TABLE llx_boxes_def ADD UNIQUE INDEX uk_boxes_def (file, entity); + -- We need to include note to allow several entries for external rss module + ALTER TABLE llx_boxes_def ADD UNIQUE INDEX uk_boxes_def (file, entity, note); diff --git a/htdocs/install/mysql/tables/llx_boxes_def.sql b/htdocs/install/mysql/tables/llx_boxes_def.sql index 93fde44596e..be558cd247d 100644 --- a/htdocs/install/mysql/tables/llx_boxes_def.sql +++ b/htdocs/install/mysql/tables/llx_boxes_def.sql @@ -25,11 +25,11 @@ create table llx_boxes_def file varchar(255) NOT NULL, entity integer DEFAULT 1 NOT NULL, -- multi company id tms timestamp, - note text + note varchar(255) )type=innodb; -- --- List of codes for the field entity +-- List of codes for the field "entity" -- -- 1 : first company boxes -- 2 : second company boxes