Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur
2022-01-25 15:43:42 +01:00
parent be01e3b1ac 80e2c1c449
commit c3a58ae303
15 changed files with 55 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/install/mysql/migration/14.0.0-15.0.0.sql
View File

@@ -292,7 +292,7 @@ CREATE TABLE llx_hrm_job_user(
date_creation datetime NOT NULL,
tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
fk_contrat integer,
fk_user integer NOT NULL,
fk_user integer,
fk_job integer NOT NULL,
date_start date,
date_end date,

2
htdocs/install/mysql/tables/llx_hrm_job_user-hrm.sql
View File

@@ -23,7 +23,7 @@ CREATE TABLE llx_hrm_job_user(
date_creation datetime NOT NULL,
tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
fk_contrat integer,
fk_user integer NOT NULL,
fk_user integer,
fk_job integer NOT NULL,
date_start datetime,
date_end datetime,