From 85d51b0d6fb82a59b07faff86a9f70a36921799a Mon Sep 17 00:00:00 2001 From: aspangaro Date: Mon, 28 Mar 2016 07:46:55 +0200 Subject: [PATCH 1/2] Correct of problem of merging with my last commits --- htdocs/admin/dict.php | 2 +- .../install/mysql/migration/3.9.0-4.0.0.sql | 14 ++++++++++ .../tables/llx_c_accountancy_category.key.sql | 21 ++++++++++++++ .../tables/llx_c_accountancy_category.sql | 28 +++++++++++++++++++ 4 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 htdocs/install/mysql/tables/llx_c_accountancy_category.key.sql create mode 100644 htdocs/install/mysql/tables/llx_c_accountancy_category.sql diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index e1fe67518bc..01b379abf0d 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -80,7 +80,7 @@ $hookmanager->initHooks(array('admin')); // Put here declaration of dictionaries properties // Sort order to show dictionary (0 is space). All other dictionaries (added by modules) will be at end of this. -$taborder=array(9,0,4,3,2,0,1,8,19,16,27,0,5,11,33,34,0,6,0,29,0,7,17,24,28,0,10,23,12,13,0,14,0,22,20,18,21,0,15,30,0,25,0,26,0,31,0); +$taborder=array(9,0,4,3,2,0,1,8,19,16,27,0,5,11,33,34,0,6,0,29,0,7,17,24,28,0,10,23,12,13,0,14,0,22,20,18,21,0,15,30,0,25,0,26,0,31,32,0); // Name of SQL tables of dictionaries $tabname=array(); diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql index f20f784ac0d..3fa7d67c7ec 100644 --- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql +++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql @@ -323,3 +323,17 @@ ALTER TABLE llx_expensereport_det ADD COLUMN multicurrency_total_ttc double(24,8 ALTER TABLE llx_product_lang ADD COLUMN import_key varchar(14) DEFAULT NULL; ALTER TABLE llx_actioncomm MODIFY COLUMN elementtype varchar(255) DEFAULT NULL; + +DELETE FROM llx_menu where module='expensereport'; + +CREATE TABLE llx_c_accountancy_category ( + rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, + code varchar(16) NOT NULL, + label varchar(255) NOT NULL, + range varchar(255) NOT NULL, + position integer DEFAULT 0, + fk_country integer DEFAULT NULL, -- This category is dedicated to a country + active integer DEFAULT 1 +) ENGINE=innodb; + +ALTER TABLE llx_c_accountancy_category ADD UNIQUE INDEX uk_c_accountancy_category(code); \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_c_accountancy_category.key.sql b/htdocs/install/mysql/tables/llx_c_accountancy_category.key.sql new file mode 100644 index 00000000000..c4adc3a37da --- /dev/null +++ b/htdocs/install/mysql/tables/llx_c_accountancy_category.key.sql @@ -0,0 +1,21 @@ +-- =================================================================== +-- Copyright (C) 2015-2016 Alexandre Spangaro +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- Table with templates of emails +-- =================================================================== + +ALTER TABLE llx_c_accountancy_category ADD UNIQUE INDEX uk_c_accountancy_category(code); + diff --git a/htdocs/install/mysql/tables/llx_c_accountancy_category.sql b/htdocs/install/mysql/tables/llx_c_accountancy_category.sql new file mode 100644 index 00000000000..60b74c77291 --- /dev/null +++ b/htdocs/install/mysql/tables/llx_c_accountancy_category.sql @@ -0,0 +1,28 @@ +-- =================================================================== +-- Copyright (C) 2015-2016 Alexandre Spangaro +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- Table with templates of emails +-- =================================================================== + +CREATE TABLE llx_c_accountancy_category ( + rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, + code varchar(16) NOT NULL, + label varchar(255) NOT NULL, + range varchar(255) NOT NULL, + position integer DEFAULT 0, + fk_country integer DEFAULT NULL, -- This category is dedicated to a country + active integer DEFAULT 1 +) ENGINE=innodb; From 8acf39cbb1061de537505820c0fcdae6789dd0ec Mon Sep 17 00:00:00 2001 From: aspangaro Date: Mon, 28 Mar 2016 13:58:14 +0200 Subject: [PATCH 2/2] Uniformize name of table --- htdocs/install/mysql/migration/3.9.0-4.0.0.sql | 4 ++-- ...ncy_category.key.sql => llx_c_accounting_category.key.sql} | 4 ++-- ...accountancy_category.sql => llx_c_accounting_category.sql} | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename htdocs/install/mysql/tables/{llx_c_accountancy_category.key.sql => llx_c_accounting_category.key.sql} (86%) rename htdocs/install/mysql/tables/{llx_c_accountancy_category.sql => llx_c_accounting_category.sql} (93%) diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql index 3fa7d67c7ec..ab71e70e863 100644 --- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql +++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql @@ -326,7 +326,7 @@ ALTER TABLE llx_actioncomm MODIFY COLUMN elementtype varchar(255) DEFAULT NULL; DELETE FROM llx_menu where module='expensereport'; -CREATE TABLE llx_c_accountancy_category ( +CREATE TABLE llx_c_accounting_category ( rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, code varchar(16) NOT NULL, label varchar(255) NOT NULL, @@ -336,4 +336,4 @@ CREATE TABLE llx_c_accountancy_category ( active integer DEFAULT 1 ) ENGINE=innodb; -ALTER TABLE llx_c_accountancy_category ADD UNIQUE INDEX uk_c_accountancy_category(code); \ No newline at end of file +ALTER TABLE llx_c_accounting_category ADD UNIQUE INDEX uk_c_accounting_category(code); \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_c_accountancy_category.key.sql b/htdocs/install/mysql/tables/llx_c_accounting_category.key.sql similarity index 86% rename from htdocs/install/mysql/tables/llx_c_accountancy_category.key.sql rename to htdocs/install/mysql/tables/llx_c_accounting_category.key.sql index c4adc3a37da..6b2d520a156 100644 --- a/htdocs/install/mysql/tables/llx_c_accountancy_category.key.sql +++ b/htdocs/install/mysql/tables/llx_c_accounting_category.key.sql @@ -14,8 +14,8 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -- --- Table with templates of emails +-- Table with category for accounting account -- =================================================================== -ALTER TABLE llx_c_accountancy_category ADD UNIQUE INDEX uk_c_accountancy_category(code); +ALTER TABLE llx_c_accounting_category ADD UNIQUE INDEX uk_c_accounting_category(code); diff --git a/htdocs/install/mysql/tables/llx_c_accountancy_category.sql b/htdocs/install/mysql/tables/llx_c_accounting_category.sql similarity index 93% rename from htdocs/install/mysql/tables/llx_c_accountancy_category.sql rename to htdocs/install/mysql/tables/llx_c_accounting_category.sql index 60b74c77291..0e789a6826c 100644 --- a/htdocs/install/mysql/tables/llx_c_accountancy_category.sql +++ b/htdocs/install/mysql/tables/llx_c_accounting_category.sql @@ -14,10 +14,10 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -- --- Table with templates of emails +-- Table with category for accounting account -- =================================================================== -CREATE TABLE llx_c_accountancy_category ( +CREATE TABLE llx_c_accounting_category ( rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, code varchar(16) NOT NULL, label varchar(255) NOT NULL,