Skip to content
Snippets Groups Projects
Commit af92eb37 authored by aspangaro's avatar aspangaro
Browse files

Problem of merging

parent f774ff48
Branches
Tags
No related merge requests found
...@@ -972,7 +972,6 @@ CREATE TABLE llx_holiday_types ( ...@@ -972,7 +972,6 @@ CREATE TABLE llx_holiday_types (
deleteAt DATETIME, deleteAt DATETIME,
nbCongesDeducted varchar(255) NOT NULL, nbCongesDeducted varchar(255) NOT NULL,
nbCongesEveryMonth varchar(255) NOT NULL nbCongesEveryMonth varchar(255) NOT NULL
<<<<<<< HEAD
); );
-- Change on table c_civilite -- Change on table c_civilite
...@@ -983,17 +982,13 @@ ALTER TABLE llx_c_civility ADD UNIQUE INDEX uk_c_civility(code); ...@@ -983,17 +982,13 @@ ALTER TABLE llx_c_civility ADD UNIQUE INDEX uk_c_civility(code);
ALTER TABLE llx_adherent CHANGE civilite civility VARCHAR(6); ALTER TABLE llx_adherent CHANGE civilite civility VARCHAR(6);
ALTER TABLE llx_socpeople CHANGE civilite civility VARCHAR(6); ALTER TABLE llx_socpeople CHANGE civilite civility VARCHAR(6);
ALTER TABLE llx_user CHANGE civilite civility VARCHAR(6); ALTER TABLE llx_user CHANGE civilite civility VARCHAR(6);
=======
) ENGINE=innodb; ) ENGINE=innodb;
ALTER TABLE llx_c_type_fees CHANGE libelle label VARCHAR(30); ALTER TABLE llx_c_type_fees CHANGE libelle label VARCHAR(30);
ALTER TABLE llx_c_type_fees ADD COLUMN accountancy_code varchar(32) DEFAULT NULL AFTER label; ALTER TABLE llx_c_type_fees ADD COLUMN accountancy_code varchar(32) DEFAULT NULL AFTER label;
ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_fk_element (fk_element); ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_fk_element (fk_element);
ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_task (fk_task); ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_task (fk_task);
ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_date (task_date); ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_date (task_date);
ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_datehour (task_datehour); ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_datehour (task_datehour);
>>>>>>> refs/remotes/Upstream/develop
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment