From 5a87d94b3c8c04fea9431bfdd33fa38c2122df83 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 9 Sep 2021 20:38:25 +0200 Subject: [PATCH] Add missing fields into llx_holiday --- htdocs/install/mysql/migration/14.0.0-15.0.0.sql | 3 +++ htdocs/install/mysql/tables/llx_holiday.sql | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql index 8e426922cc8..fb37c2f94d2 100644 --- a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql +++ b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql @@ -49,6 +49,9 @@ ALTER TABLE llx_salary_extrafields ADD INDEX idx_salary_extrafields (fk_object); -- v15 +ALTER TABLE llx_holiday ADD COLUMN date_approve DATETIME DEFAULT NULL; +ALTER TABLE llx_holiday ADD COLUMN fk_user_approve integer DEFAULT NULL; + ALTER TABLE llx_emailcollector_emailcollectoraction MODIFY COLUMN actionparam TEXT; ALTER TABLE llx_knowledgemanagement_knowledgerecord ADD COLUMN lang varchar(6); diff --git a/htdocs/install/mysql/tables/llx_holiday.sql b/htdocs/install/mysql/tables/llx_holiday.sql index 3cd5727d867..992f9502394 100644 --- a/htdocs/install/mysql/tables/llx_holiday.sql +++ b/htdocs/install/mysql/tables/llx_holiday.sql @@ -33,8 +33,10 @@ date_fin DATE NOT NULL, halfday integer DEFAULT 0, -- 0=start morning and end afternoon, -1=start afternoon end afternoon, 1=start morning and end morning, 2=start afternoon and end morning statut integer NOT NULL DEFAULT '1', fk_validator integer NOT NULL, -- who should approve -date_valid DATETIME DEFAULT NULL, -- date approval -fk_user_valid integer DEFAULT NULL, -- user approval +date_valid DATETIME DEFAULT NULL, -- date approval (both date valid and date_approval) +fk_user_valid integer DEFAULT NULL, -- user approval (both user valid and user that approved) +date_approve DATETIME DEFAULT NULL, -- date approval (not used yet) +fk_user_approve integer DEFAULT NULL, -- user approval (not used yet) date_refuse DATETIME DEFAULT NULL, fk_user_refuse integer DEFAULT NULL, date_cancel DATETIME DEFAULT NULL,