From dcf76d7bcb3c0d155fa93af3b2fbc55348ed6ae7 Mon Sep 17 00:00:00 2001 From: fhenry Date: Thu, 28 Feb 2013 21:13:25 +0100 Subject: [PATCH 1/3] Fix [ bug #736 ] --- htdocs/install/mysql/migration/3.2.0-3.3.0.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql index dacb7519f28..7f23d8e2509 100755 --- a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql +++ b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql @@ -925,3 +925,5 @@ UPDATE llx_c_action_trigger SET code='FICHINTER_VALIDATE' WHERE code='FICHEINTER UPDATE llx_c_departements SET ncc='ALAVA', nom='Álava' WHERE code_departement='01' AND fk_region=419; ALTER TABLE llx_product_fournisseur_price DROP FOREIGN KEY fk_product_fournisseur; + +ALTER TABLE llx_c_chargesociales ADD COLUMN accountancy_code varchar(15) AFTER code; From 7952a1f1a50452af57d3e80e192eb4a1804b7ff9 Mon Sep 17 00:00:00 2001 From: fhenry Date: Thu, 28 Feb 2013 21:15:45 +0100 Subject: [PATCH 2/3] rool back changes --- htdocs/install/mysql/migration/3.2.0-3.3.0.sql | 2 -- 1 file changed, 2 deletions(-) diff --git a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql index 7f23d8e2509..dacb7519f28 100755 --- a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql +++ b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql @@ -925,5 +925,3 @@ UPDATE llx_c_action_trigger SET code='FICHINTER_VALIDATE' WHERE code='FICHEINTER UPDATE llx_c_departements SET ncc='ALAVA', nom='Álava' WHERE code_departement='01' AND fk_region=419; ALTER TABLE llx_product_fournisseur_price DROP FOREIGN KEY fk_product_fournisseur; - -ALTER TABLE llx_c_chargesociales ADD COLUMN accountancy_code varchar(15) AFTER code; From 0d0c1e8c148545049ac3d150da781a2c7b2ccf3f Mon Sep 17 00:00:00 2001 From: fhenry Date: Thu, 28 Feb 2013 21:18:52 +0100 Subject: [PATCH 3/3] Fix [ bug #736 ] --- htdocs/install/mysql/migration/3.2.0-3.3.0.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql index dacb7519f28..7053bd6e4ef 100755 --- a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql +++ b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql @@ -311,7 +311,7 @@ UPDATE llx_c_tva set localtax1 = 1, localtax1_type = '4', localtax2 = 0.4, local ALTER TABLE llx_c_tva DROP COLUMN accountancy_code; ALTER TABLE llx_c_tva ADD COLUMN accountancy_code_sell varchar(15) DEFAULT NULL AFTER active; ALTER TABLE llx_c_tva ADD COLUMN accountancy_code_buy varchar(15) DEFAULT NULL AFTER accountancy_code_sell; -ALTER TABLE llx_c_chargessociales ADD COLUMN accountancy_code varchar(15) DEFAULT NULL AFTER code; +ALTER TABLE llx_c_chargesociales ADD COLUMN accountancy_code varchar(15) DEFAULT NULL AFTER code; -- Tables for accountancy expert DROP TABLE llx_accountingaccount;