From f42fbb639901aa0d4530599b7ad437b595ebf535 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 6 Jan 2025 15:17:47 +0100 Subject: [PATCH] FIX missing entity field in llx_holiday_config --- htdocs/install/mysql/migration/20.0.0-21.0.0.sql | 4 ++++ htdocs/install/mysql/tables/llx_holiday_config.key.sql | 2 +- htdocs/install/mysql/tables/llx_holiday_config.sql | 7 ++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/htdocs/install/mysql/migration/20.0.0-21.0.0.sql b/htdocs/install/mysql/migration/20.0.0-21.0.0.sql index 19a8b90a04c..fcf1f4bcc98 100644 --- a/htdocs/install/mysql/migration/20.0.0-21.0.0.sql +++ b/htdocs/install/mysql/migration/20.0.0-21.0.0.sql @@ -398,3 +398,7 @@ ALTER TABLE llx_user MODIFY COLUMN signature LONGTEXT; ALTER TABLE llx_societe_rib DROP INDEX uk_societe_rib; ALTER TABLE llx_societe_rib ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER rowid; ALTER TABLE llx_societe_rib ADD UNIQUE INDEX uk_societe_rib(entity, label, fk_soc); + +ALTER TABLE llx_holiday_config DROP INDEX idx_holiday_config; +ALTER TABLE llx_holiday_config ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER rowid; +ALTER TABLE llx_holiday_config ADD UNIQUE INDEX idx_holiday_config (entity, name); diff --git a/htdocs/install/mysql/tables/llx_holiday_config.key.sql b/htdocs/install/mysql/tables/llx_holiday_config.key.sql index c1b18e760d1..6591351c940 100644 --- a/htdocs/install/mysql/tables/llx_holiday_config.key.sql +++ b/htdocs/install/mysql/tables/llx_holiday_config.key.sql @@ -16,5 +16,5 @@ -- -- =================================================================== -ALTER TABLE llx_holiday_config ADD UNIQUE INDEX idx_holiday_config (name); +ALTER TABLE llx_holiday_config ADD UNIQUE INDEX idx_holiday_config (entity, name); diff --git a/htdocs/install/mysql/tables/llx_holiday_config.sql b/htdocs/install/mysql/tables/llx_holiday_config.sql index cf0002dff7d..3502ab4cc9f 100644 --- a/htdocs/install/mysql/tables/llx_holiday_config.sql +++ b/htdocs/install/mysql/tables/llx_holiday_config.sql @@ -18,8 +18,9 @@ CREATE TABLE llx_holiday_config ( -rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, -name VARCHAR(128) NOT NULL, -value TEXT NULL +rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, +entity integer DEFAULT 1 NOT NULL, -- Multi company id +name VARCHAR(128) NOT NULL, +value TEXT NULL ) ENGINE=innodb;