From bf6463b152665df55df233d5bc71a39126db3878 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 3 Sep 2018 12:54:20 +0200 Subject: [PATCH] Revert old behaviour --- htdocs/install/mysql/migration/8.0.0-9.0.0.sql | 5 +---- htdocs/install/mysql/tables/llx_accounting_account.sql | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/htdocs/install/mysql/migration/8.0.0-9.0.0.sql b/htdocs/install/mysql/migration/8.0.0-9.0.0.sql index 56f98d28449..443540ac857 100644 --- a/htdocs/install/mysql/migration/8.0.0-9.0.0.sql +++ b/htdocs/install/mysql/migration/8.0.0-9.0.0.sql @@ -28,14 +28,12 @@ -- Note: fields with type BLOB/TEXT can't have default value. --- Missing in 8.0 ? +-- Missing in 8.0 ALTER TABLE llx_accounting_account DROP FOREIGN KEY fk_accounting_account_fk_pcg_version; ALTER TABLE llx_accounting_account MODIFY COLUMN fk_pcg_version varchar(32) NOT NULL; ALTER TABLE llx_accounting_system MODIFY COLUMN pcg_version varchar(32) NOT NULL; ALTER TABLE llx_accounting_account ADD CONSTRAINT fk_accounting_account_fk_pcg_version FOREIGN KEY (fk_pcg_version) REFERENCES llx_accounting_system (pcg_version); -ALTER TABLE llx_accounting_account MODIFY COLUMN account_number varchar(32) NOT NULL; - create table llx_facture_rec_extrafields ( rowid integer AUTO_INCREMENT PRIMARY KEY, @@ -46,7 +44,6 @@ create table llx_facture_rec_extrafields -- For 9.0 - ALTER TABLE llx_accounting_account MODIFY COLUMN account_parent varchar(32) DEFAULT NULL; ALTER TABLE llx_extrafields ADD COLUMN help text NULL; diff --git a/htdocs/install/mysql/tables/llx_accounting_account.sql b/htdocs/install/mysql/tables/llx_accounting_account.sql index 024c6ed53bf..79215115cfb 100644 --- a/htdocs/install/mysql/tables/llx_accounting_account.sql +++ b/htdocs/install/mysql/tables/llx_accounting_account.sql @@ -29,7 +29,7 @@ create table llx_accounting_account pcg_type varchar(20) NOT NULL, -- First part of Key for predefined groups pcg_subtype varchar(20) NOT NULL, -- Second part of Key for predefined groups account_number varchar(32) NOT NULL, - account_parent varchar(32) DEFAULT NULL, -- Hierarchic parent. + account_parent integer DEFAULT 0, -- Hierarchic parent. label varchar(255) NOT NULL, fk_accounting_category integer DEFAULT 0, -- ID of personalized group for report fk_user_author integer DEFAULT NULL,