lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #16509 from FHenry/develop

Browse Source 
fix : better pk creation for civility
This commit is contained in:
Laurent Destailleur 2021-03-06 11:27:06 +01:00 committed by GitHub
commit 9bba493676
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/install/mysql/migration/13.0.0-14.0.0.sql
View File

@ -215,6 +215,13 @@ ALTER TABLE llx_propal CHANGE COLUMN tva total_tva double(24,8) default 0;
ALTER TABLE llx_propal CHANGE COLUMN total total_ttc double(24,8) default 0; ALTER TABLE llx_propal CHANGE COLUMN total total_ttc double(24,8) default 0;
ALTER TABLE llx_commande_fournisseur CHANGE COLUMN tva total_tva double(24,8) default 0; ALTER TABLE llx_commande_fournisseur CHANGE COLUMN tva total_tva double(24,8) default 0;
--VMYSQL4.3 ALTER TABLE llx_c_civility CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
--VPGSQL8.2 CREATE SEQUENCE llx_c_civility_rowid_seq OWNED BY llx_c_civility.rowid;
--VPGSQL8.2 ALTER TABLE llx_c_civility ALTER COLUMN rowid SET DEFAULT nextval('llx_c_civility_rowid_seq');
--VPGSQL8.2 SELECT setval('llx_c_civility_rowid_seq', MAX(rowid)) FROM llx_c_civility;
-- Change for salary intent table -- Change for salary intent table
create table llx_salary create table llx_salary
( (
@ -239,7 +246,7 @@ create table llx_salary
fk_account integer, -- default bank account for payment fk_account integer, -- default bank account for payment
fk_user_author integer, -- user creating fk_user_author integer, -- user creating
fk_user_modif integer -- user making last change fk_user_modif integer -- user making last change
)ENGINE=innodb; ) ENGINE=innodb;
ALTER TABLE llx_payment_salary CHANGE COLUMN fk_user fk_user integer NULL; ALTER TABLE llx_payment_salary CHANGE COLUMN fk_user fk_user integer NULL;
ALTER TABLE llx_payment_salary ADD COLUMN fk_salary integer; ALTER TABLE llx_payment_salary ADD COLUMN fk_salary integer;

2
htdocs/install/mysql/tables/llx_c_civility.sql
View File

@ -19,7 +19,7 @@
create table llx_c_civility create table llx_c_civility
( (
rowid integer PRIMARY KEY, rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL
code varchar(6) NOT NULL, code varchar(6) NOT NULL,
label varchar(50), label varchar(50),
active tinyint DEFAULT 1 NOT NULL, active tinyint DEFAULT 1 NOT NULL,