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

Merge pull request #19266 from frederic34/rankisreserved

Browse Source 
replace reseved word rank
This commit is contained in:
Laurent Destailleur
2021-11-01 02:31:16 +01:00
committed by GitHub
parent ce9e7067ac 9a68a97fc6
commit 0bdfa84bbf
6 changed files with 128 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/hrm/class/position.class.php
View File

@@ -113,7 +113,7 @@ class Position extends CommonObject
'fk_job' => array('type'=>'integer:Job:/hrm/class/job.class.php', 'label'=>'Job', 'enabled'=>'1', 'position'=>56, 'notnull'=>1, 'visible'=>1,),
'date_start' => array('type'=>'date', 'label'=>'DateStart', 'enabled'=>'1', 'position'=>51, 'notnull'=>1, 'visible'=>1,),
'date_end' => array('type'=>'date', 'label'=>'DateEnd', 'enabled'=>'1', 'position'=>52, 'notnull'=>0, 'visible'=>1,),
'commentaire_abandon' => array('type'=>'varchar(255)', 'label'=>'AbandonmentComment', 'enabled'=>'1', 'position'=>502, 'notnull'=>0, 'visible'=>1,),
'abort_comment' => array('type'=>'varchar(255)', 'label'=>'AbandonmentComment', 'enabled'=>'1', 'position'=>502, 'notnull'=>0, 'visible'=>1,),
'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>70, 'notnull'=>0, 'visible'=>0,),
'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>71, 'notnull'=>0, 'visible'=>0,),
'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
@@ -129,7 +129,7 @@ class Position extends CommonObject
public $fk_job;
public $date_start;
public $date_end;
public $commentaire_abandon;
public $abort_comment;
public $note_public;
public $note_private;
public $fk_user_creat;

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

@@ -157,24 +157,23 @@ INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (20, '2012', '
-- START GRH/HRM MODULE
CREATE TABLE llx_hrm_evaluation(
-- BEGIN MODULEBUILDER FIELDS
rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
ref varchar(128) DEFAULT '(PROV)' NOT NULL,
label varchar(255),
description text,
note_public text,
note_private text,
date_creation datetime NOT NULL,
tms timestamp,
fk_user_creat integer NOT NULL,
fk_user_modif integer,
import_key varchar(14),
status smallint NOT NULL,
date_eval date,
fk_user integer NOT NULL,
fk_job integer NOT NULL
-- END MODULEBUILDER FIELDS
CREATE TABLE llx_hrm_evaluation
(
rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
ref varchar(128) DEFAULT '(PROV)' NOT NULL,
label varchar(255),
description text,
note_public text,
note_private text,
date_creation datetime NOT NULL,
tms timestamp,
fk_user_creat integer NOT NULL,
fk_user_modif integer,
import_key varchar(14),
status smallint NOT NULL,
date_eval date,
fk_user integer NOT NULL,
fk_job integer NOT NULL
) ENGINE=innodb;
ALTER TABLE llx_hrm_evaluation ADD INDEX idx_hrm_evaluation_rowid (rowid);
ALTER TABLE llx_hrm_evaluation ADD INDEX idx_hrm_evaluation_ref (ref);
@@ -193,19 +192,19 @@ create table llx_hrm_evaluation_extrafields
ALTER TABLE llx_hrm_evaluation_extrafields ADD INDEX idx_evaluation_fk_object(fk_object);
CREATE TABLE llx_hrm_evaluationdet(
CREATE TABLE llx_hrm_evaluationdet
(
-- BEGIN MODULEBUILDER FIELDS
rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
date_creation datetime NOT NULL,
tms timestamp,
fk_user_creat integer NOT NULL,
fk_user_modif integer,
fk_skill integer NOT NULL,
fk_evaluation integer NOT NULL,
rank integer NOT NULL,
required_rank integer NOT NULL,
import_key varchar(14)
-- END MODULEBUILDER FIELDS
rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
date_creation datetime NOT NULL,
tms timestamp,
fk_user_creat integer NOT NULL,
fk_user_modif integer,
fk_skill integer NOT NULL,
fk_evaluation integer NOT NULL,
rankorder integer NOT NULL,
required_rank integer NOT NULL,
import_key varchar(14)
) ENGINE=innodb;
ALTER TABLE llx_hrm_evaluationdet ADD INDEX idx_hrm_evaluationdet_rowid (rowid);
@@ -226,20 +225,18 @@ ALTER TABLE llx_hrm_evaluationdet_extrafields ADD INDEX idx_evaluationdet_fk_obj
CREATE TABLE llx_hrm_job(
rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
label varchar(255) NOT NULL,
description text,
date_creation datetime NOT NULL,
tms timestamp,
deplacement varchar(255),
note_public text,
note_private text,
fk_user_creat integer,
fk_user_modif integer
CREATE TABLE llx_hrm_job
(
rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
label varchar(255) NOT NULL,
description text,
date_creation datetime NOT NULL,
tms timestamp,
deplacement varchar(255),
note_public text,
note_private text,
fk_user_creat integer,
fk_user_modif integer
) ENGINE=innodb;
ALTER TABLE llx_hrm_job ADD INDEX idx_hrm_job_rowid (rowid);
@@ -259,23 +256,21 @@ ALTER TABLE llx_hrm_job_extrafields ADD INDEX idx_job_fk_object(fk_object);
CREATE TABLE llx_hrm_job_user(
-- BEGIN MODULEBUILDER FIELDS
rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
-- ref varchar(128) NOT NULL,
description text,
date_creation datetime NOT NULL,
tms timestamp,
fk_contrat integer,
fk_user integer NOT NULL,
fk_job integer NOT NULL,
date_start date,
date_end date,
commentaire_abandon varchar(255),
note_public text,
note_private text,
fk_user_creat integer,
fk_user_modif integer
-- END MODULEBUILDER FIELDS
rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
-- ref varchar(128) NOT NULL,
description text,
date_creation datetime NOT NULL,
tms timestamp,
fk_contrat integer,
fk_user integer NOT NULL,
fk_job integer NOT NULL,
date_start date,
date_end date,
abort_comment varchar(255),
note_public text,
note_private text,
fk_user_creat integer,
fk_user_modif integer
) ENGINE=innodb;
ALTER TABLE llx_hrm_job_user ADD INDEX idx_hrm_job_user_rowid (rowid);
@@ -294,22 +289,21 @@ ALTER TABLE llx_hrm_job_user_extrafields ADD INDEX idx_position_fk_object(fk_obj
CREATE TABLE llx_hrm_skill(
-- BEGIN MODULEBUILDER FIELDS
rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
label varchar(255),
description text,
date_creation datetime NOT NULL,
tms timestamp,
fk_user_creat integer NOT NULL,
fk_user_modif integer,
required_level integer NOT NULL,
date_validite integer NOT NULL,
temps_theorique double(24,8) NOT NULL,
skill_type integer NOT NULL,
note_public text,
note_private text
-- END MODULEBUILDER FIELDS
CREATE TABLE llx_hrm_skill
(
rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
label varchar(255),
description text,
date_creation datetime NOT NULL,
tms timestamp,
fk_user_creat integer NOT NULL,
fk_user_modif integer,
required_level integer NOT NULL,
date_validite integer NOT NULL,
temps_theorique double(24,8) NOT NULL,
skill_type integer NOT NULL,
note_public text,
note_private text
) ENGINE=innodb;
ALTER TABLE llx_hrm_skill ADD INDEX idx_hrm_skill_rowid (rowid);
@@ -327,15 +321,14 @@ create table llx_hrm_skill_extrafields
ALTER TABLE llx_hrm_skill_extrafields ADD INDEX idx_skill_fk_object(fk_object);
CREATE TABLE llx_hrm_skilldet(
-- BEGIN MODULEBUILDER FIELDS
rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
description text,
fk_user_creat integer NOT NULL,
fk_user_modif integer,
fk_skill integer NOT NULL,
rank integer
-- END MODULEBUILDER FIELDS
CREATE TABLE llx_hrm_skilldet
(
rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
description text,
fk_user_creat integer NOT NULL,
fk_user_modif integer,
fk_skill integer NOT NULL,
rankorder integer
) ENGINE=innodb;
ALTER TABLE llx_hrm_skilldet ADD INDEX idx_hrm_skilldet_rowid (rowid);
@@ -352,18 +345,17 @@ create table llx_hrm_skilldet_extrafields
ALTER TABLE llx_hrm_skilldet_extrafields ADD INDEX idx_skilldet_fk_object(fk_object);
CREATE TABLE llx_hrm_skillrank(
-- BEGIN MODULEBUILDER FIELDS
rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
fk_skill integer NOT NULL,
rank integer NOT NULL,
fk_object integer NOT NULL,
date_creation datetime NOT NULL,
tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
fk_user_creat integer NOT NULL,
fk_user_modif integer,
objecttype varchar(128) NOT NULL
-- END MODULEBUILDER FIELDS
CREATE TABLE llx_hrm_skillrank
(
rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
fk_skill integer NOT NULL,
rankorder integer NOT NULL,
fk_object integer NOT NULL,
date_creation datetime NOT NULL,
tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
fk_user_creat integer NOT NULL,
fk_user_modif integer,
objecttype varchar(128) NOT NULL
) ENGINE=innodb;
ALTER TABLE llx_hrm_skillrank ADD INDEX idx_hrm_skillrank_rowid (rowid);
@@ -429,4 +421,3 @@ ALTER TABLE llx_socpeople DROP COLUMN googleplus;
ALTER TABLE llx_socpeople DROP COLUMN youtube;
ALTER TABLE llx_socpeople DROP COLUMN whatsapp;

23
htdocs/install/mysql/tables/llx_hrm_evaluationdet.sql
View File

@@ -16,17 +16,16 @@
-- along with this program. If not, see https://www.gnu.org/licenses/.
CREATE TABLE llx_hrm_evaluationdet(
-- BEGIN MODULEBUILDER FIELDS
rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
date_creation datetime NOT NULL,
tms timestamp,
fk_user_creat integer NOT NULL,
fk_user_modif integer,
fk_skill integer NOT NULL,
fk_evaluation integer NOT NULL,
rank integer NOT NULL,
required_rank integer NOT NULL,
CREATE TABLE llx_hrm_evaluationdet
(
rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
date_creation datetime NOT NULL,
tms timestamp,
fk_user_creat integer NOT NULL,
fk_user_modif integer,
fk_skill integer NOT NULL,
fk_evaluation integer NOT NULL,
rankorder integer NOT NULL,
required_rank integer NOT NULL,
import_key varchar(14)
-- END MODULEBUILDER FIELDS
) ENGINE=innodb;

20
htdocs/install/mysql/tables/llx_hrm_job_user.sql
View File

@@ -17,17 +17,17 @@
CREATE TABLE llx_hrm_job_user(
-- BEGIN MODULEBUILDER FIELDS
rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
-- ref varchar(128) NOT NULL,
description text,
date_creation datetime NOT NULL,
tms timestamp,
fk_contrat integer,
fk_user integer NOT NULL,
fk_job integer NOT NULL,
date_start datetime,
date_end datetime,
commentaire_abandon varchar(255),
description text,
date_creation datetime NOT NULL,
tms timestamp,
fk_contrat integer,
fk_user integer NOT NULL,
fk_job integer NOT NULL,
date_start datetime,
date_end datetime,
abort_comment varchar(255),
note_public text,
note_private text,
fk_user_creat integer,

14
htdocs/install/mysql/tables/llx_hrm_skilldet.sql
View File

@@ -17,12 +17,10 @@
CREATE TABLE llx_hrm_skilldet(
-- BEGIN MODULEBUILDER FIELDS
rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
description text,
fk_user_creat integer NOT NULL,
fk_user_modif integer,
fk_skill integer NOT NULL,
rank integer
-- END MODULEBUILDER FIELDS
rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
description text,
fk_user_creat integer NOT NULL,
fk_user_modif integer,
fk_skill integer NOT NULL,
rankorder integer
) ENGINE=innodb;

19
htdocs/install/mysql/tables/llx_hrm_skillrank.sql
View File

@@ -15,16 +15,15 @@
-- along with this program. If not, see https://www.gnu.org/licenses/.
CREATE TABLE llx_hrm_skillrank(
-- BEGIN MODULEBUILDER FIELDS
rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
fk_skill integer NOT NULL,
rank integer NOT NULL,
fk_object integer NOT NULL,
date_creation datetime NOT NULL,
CREATE TABLE llx_hrm_skillrank
(
rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
fk_skill integer NOT NULL,
rankorder integer NOT NULL,
fk_object integer NOT NULL,
date_creation datetime NOT NULL,
tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
fk_user_creat integer NOT NULL,
fk_user_modif integer,
fk_user_creat integer NOT NULL,
fk_user_modif integer,
objecttype varchar(128) NOT NULL
-- END MODULEBUILDER FIELDS
) ENGINE=innodb;