From 868d8858064b83eefade32f3258dd756d9d975f8 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Sat, 5 Oct 2024 18:49:34 +0200 Subject: [PATCH] NEW Accountancy - Add general account on thirdparty - SQL Part (#31280) --- .../install/mysql/migration/20.0.0-21.0.0.sql | 12 ++++++++++++ htdocs/install/mysql/tables/llx_societe.sql | 8 ++++++-- .../llx_societe_perentity-multicompany.sql | 18 ++++++++++-------- htdocs/install/mysql/tables/llx_user.sql | 12 ++++++++---- 4 files changed, 36 insertions(+), 14 deletions(-) diff --git a/htdocs/install/mysql/migration/20.0.0-21.0.0.sql b/htdocs/install/mysql/migration/20.0.0-21.0.0.sql index ba603342da7..07159bd1847 100644 --- a/htdocs/install/mysql/migration/20.0.0-21.0.0.sql +++ b/htdocs/install/mysql/migration/20.0.0-21.0.0.sql @@ -136,3 +136,15 @@ ALTER TABLE llx_recruitment_recruitmentcandidature MODIFY fk_user_creat integer ALTER TABLE llx_ecm_files ADD COLUMN agenda_id integer; +-- Add accountancy code general on user / customer / supplier subledger +ALTER TABLE llx_user ADD COLUMN accountancy_code_user_general varchar(32) DEFAULT NULL AFTER fk_barcode_type; +ALTER TABLE llx_societe ADD COLUMN accountancy_code_customer_general varchar(32) DEFAULT NULL AFTER code_fournisseur; +ALTER TABLE llx_societe ADD COLUMN accountancy_code_supplier_general varchar(32) DEFAULT NULL AFTER code_compta; +ALTER TABLE llx_societe_perentity ADD COLUMN accountancy_code_customer_general varchar(32) DEFAULT NULL AFTER entity; +ALTER TABLE llx_societe_perentity ADD COLUMN accountancy_code_supplier_general varchar(32) DEFAULT NULL AFTER accountancy_code_customer; + +-- Uniformize length of accountancy account +ALTER TABLE llx_societe MODIFY COLUMN code_compta varchar(32); +ALTER TABLE llx_societe MODIFY COLUMN code_compta_fournisseur varchar(32); +ALTER TABLE llx_societe_perentity MODIFY COLUMN accountancy_code_customer varchar(32); +ALTER TABLE llx_societe_perentity MODIFY COLUMN accountancy_code_supplier varchar(32); diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql index ab5a3782ab6..a4ce431ada2 100644 --- a/htdocs/install/mysql/tables/llx_societe.sql +++ b/htdocs/install/mysql/tables/llx_societe.sql @@ -38,8 +38,12 @@ create table llx_societe code_client varchar(24), -- code client code_fournisseur varchar(24), -- code fournisseur - code_compta varchar(24), -- customer accountancy auxiliary account - code_compta_fournisseur varchar(24), -- supplier accountancy auxiliary account + + accountancy_code_customer_general varchar(32) DEFAULT NULL, -- customer accountancy general account + code_compta varchar(32), -- customer accountancy auxiliary account + accountancy_code_supplier_general varchar(32) DEFAULT NULL, -- supplier accountancy general account + code_compta_fournisseur varchar(32), -- supplier accountancy auxiliary account + address varchar(255), -- company address zip varchar(25), -- zipcode town varchar(50), -- town diff --git a/htdocs/install/mysql/tables/llx_societe_perentity-multicompany.sql b/htdocs/install/mysql/tables/llx_societe_perentity-multicompany.sql index 78943d84635..a8d28fb6b22 100644 --- a/htdocs/install/mysql/tables/llx_societe_perentity-multicompany.sql +++ b/htdocs/install/mysql/tables/llx_societe_perentity-multicompany.sql @@ -19,12 +19,14 @@ create table llx_societe_perentity ( - rowid integer AUTO_INCREMENT PRIMARY KEY, - fk_soc integer, - entity integer DEFAULT 1 NOT NULL, -- multi company id - accountancy_code_customer varchar(24), -- customer accountancy auxiliary account - accountancy_code_supplier varchar(24), -- supplier accountancy auxiliary account - accountancy_code_sell varchar(32), -- Selling accountancy code - accountancy_code_buy varchar(32), -- Buying accountancy code - vat_reverse_charge tinyint DEFAULT 0 -- VAT reverse charge + rowid integer AUTO_INCREMENT PRIMARY KEY, + fk_soc integer, + entity integer DEFAULT 1 NOT NULL, -- multi company id + accountancy_code_customer_general varchar(32) DEFAULT NULL, -- customer accountancy general account + accountancy_code_customer varchar(32), -- customer accountancy auxiliary account + accountancy_code_supplier_general varchar(32) DEFAULT NULL, -- supplier accountancy general account + accountancy_code_supplier varchar(32), -- supplier accountancy auxiliary account + accountancy_code_sell varchar(32), -- Selling accountancy code + accountancy_code_buy varchar(32), -- Buying accountancy code + vat_reverse_charge tinyint DEFAULT 0 -- VAT reverse charge )ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql index 06c8ad99a0b..065c6bd4f0d 100644 --- a/htdocs/install/mysql/tables/llx_user.sql +++ b/htdocs/install/mysql/tables/llx_user.sql @@ -1,7 +1,8 @@ -- ============================================================================ --- Copyright (C) 2001-2003 Rodolphe Quiedeville --- Copyright (C) 2006-2013 Laurent Destailleur --- Copyright (C) 2007-2013 Regis Houssin +-- Copyright (C) 2001-2003 Rodolphe Quiedeville +-- Copyright (C) 2006-2013 Laurent Destailleur +-- Copyright (C) 2007-2013 Regis Houssin +-- Copyright (C) 2024 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 @@ -98,7 +99,10 @@ create table llx_user color varchar(6), barcode varchar(255) DEFAULT NULL, fk_barcode_type integer DEFAULT 0, - accountancy_code varchar(32) NULL, + + accountancy_code_user_general varchar(32) DEFAULT NULL, + accountancy_code varchar(32) NULL, + nb_holiday integer DEFAULT 0, thm double(24,8), tjm double(24,8),