vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #32547 from Dolibarr/revert-32544-fix_21_missing_entity_field

Browse source 
Revert "FIX missing entity field in llx_holiday_config"
This commit is contained in:
Laurent Destailleur 2025-01-06 16:33:22 +01:00 committed by GitHub
commit 76c314569c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
htdocs/install/mysql/migration/20.0.0-21.0.0.sql
View file

@ -398,7 +398,3 @@ 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);

2
htdocs/install/mysql/tables/llx_holiday_config.key.sql
View file

@ -16,5 +16,5 @@
--
-- ===================================================================
ALTER TABLE llx_holiday_config ADD UNIQUE INDEX idx_holiday_config (entity, name);
ALTER TABLE llx_holiday_config ADD UNIQUE INDEX idx_holiday_config (name);

7
htdocs/install/mysql/tables/llx_holiday_config.sql
View file

@ -18,9 +18,8 @@
CREATE TABLE llx_holiday_config
(
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
rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
name VARCHAR(128) NOT NULL,
value TEXT NULL
)
ENGINE=innodb;