From 6d06c816fd641308ed4da4f957e046cc7b0440d0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 11 Nov 2007 23:04:02 +0000 Subject: [PATCH] Ajout d'un champ actioncompta sur les charges sociales pour permettre de distinguer les comptes dans lesquels imputer avec compta expert. --- htdocs/admin/dict.php | 8 ++++---- mysql/data/data.sql | 13 ++++++++++--- mysql/migration/2.1.0-2.2.0.sql | 17 +++++++++++++++++ mysql/tables/llx_c_chargesociales.sql | 9 +++++---- 4 files changed, 36 insertions(+), 11 deletions(-) diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 71c3b1fc446..3cadd9fdbb4 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -91,7 +91,7 @@ $tabsql[3] = "SELECT r.rowid as rowid, code_region as code , nom as libelle, r.f $tabsql[4] = "SELECT rowid as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_pays"; $tabsql[5] = "SELECT c.rowid as rowid, c.code as code, c.civilite AS libelle, c.active FROM ".MAIN_DB_PREFIX."c_civilite AS c"; $tabsql[6] = "SELECT a.id as rowid, a.code as code, a.libelle AS libelle, a.type, a.active FROM ".MAIN_DB_PREFIX."c_actioncomm AS a"; -$tabsql[7] = "SELECT a.id as rowid, a.id as code, a.libelle AS libelle, a.deductible, a.active FROM ".MAIN_DB_PREFIX."c_chargesociales AS a"; +$tabsql[7] = "SELECT a.id as rowid, a.id as code, a.libelle AS libelle, a.deductible, a.actioncompta, a.active FROM ".MAIN_DB_PREFIX."c_chargesociales AS a"; $tabsql[8] = "SELECT id as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_typent"; $tabsql[9] = "SELECT code, code_iso, label as libelle, active FROM ".MAIN_DB_PREFIX."c_currencies"; $tabsql[10]= "SELECT t.rowid, t.taux, p.libelle as pays, t.recuperableonly, t.note, t.active FROM ".MAIN_DB_PREFIX."c_tva as t, llx_c_pays as p WHERE t.fk_pays=p.rowid"; @@ -125,7 +125,7 @@ $tabfield[3] = "code,libelle,pays_id,pays"; $tabfield[4] = "code,libelle"; $tabfield[5] = "code,libelle"; $tabfield[6] = "code,libelle,type"; -$tabfield[7] = "libelle,deductible"; +$tabfield[7] = "libelle,deductible,actioncompta"; $tabfield[8] = "code,libelle"; $tabfield[9] = "code,code_iso,libelle"; $tabfield[10]= "pays,taux,recuperableonly,note"; @@ -142,7 +142,7 @@ $tabfieldvalue[3] = "code,libelle,pays"; $tabfieldvalue[4] = "code,libelle"; $tabfieldvalue[5] = "code,libelle"; $tabfieldvalue[6] = "code,libelle,type"; -$tabfieldvalue[7] = "libelle,deductible"; +$tabfieldvalue[7] = "libelle,deductible,actioncompta"; $tabfieldvalue[8] = "code,libelle"; $tabfieldvalue[9] = "code,code_iso,libelle"; $tabfieldvalue[10]= "pays,taux,recuperableonly,note"; @@ -159,7 +159,7 @@ $tabfieldinsert[3] = "code_region,nom,fk_pays"; $tabfieldinsert[4] = "code,libelle"; $tabfieldinsert[5] = "code,civilite"; $tabfieldinsert[6] = "code,libelle,type"; -$tabfieldinsert[7] = "libelle,deductible"; +$tabfieldinsert[7] = "libelle,deductible,actioncompta"; $tabfieldinsert[8] = "code,libelle"; $tabfieldinsert[9] = "code,code_iso,label"; $tabfieldinsert[10]= "fk_pays,taux,recuperableonly,note"; diff --git a/mysql/data/data.sql b/mysql/data/data.sql index c371e13d877..f51aeab15d9 100644 --- a/mysql/data/data.sql +++ b/mysql/data/data.sql @@ -350,9 +350,16 @@ delete from llx_c_ape; -- Types de charges -- -insert into llx_c_chargesociales (id,libelle,deductible) values ( 1, 'Allocations familiales',1); -insert into llx_c_chargesociales (id,libelle,deductible) values ( 2, 'GSG Deductible',1); -insert into llx_c_chargesociales (id,libelle,deductible) values ( 3, 'GSG/CRDS NON Deductible',0); +insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values ( 1, 'Allocations familiales', 1,1,'TAXFAM'); +insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values ( 2, 'GSG Deductible', 1,1,'TAXCSGD'); +insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values ( 3, 'GSG/CRDS NON Deductible',0,1,'TAXCSGND'); +insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (10, 'Taxe apprenttissage', 0,1,'TAXAPP'); +insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (11, 'Taxe professionnelle', 0,1,'TAXPRO'); +insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (20, 'Impots locaux/fonciers', 0,1,'TAXFON'); +insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (30, 'Assurance Sante (SECU-URSSAF)', 0,1,'TAXSECU'); +insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (40, 'Mutuelle', 0,1,'TAXMUT'); +insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (50, 'Assurance vieillesse (CNAV)', 0,1,'TAXRET'); +insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (60, 'Assurance Chomage (ASSEDIC)', 0,1,'TAXSECU'); -- -- Civilites diff --git a/mysql/migration/2.1.0-2.2.0.sql b/mysql/migration/2.1.0-2.2.0.sql index 1b28285d349..2dd0f5f3524 100644 --- a/mysql/migration/2.1.0-2.2.0.sql +++ b/mysql/migration/2.1.0-2.2.0.sql @@ -36,6 +36,23 @@ alter table llx_bank_url modify `type` varchar(20) NOT NULL; update llx_bank set datev = datec where datev = '1970-01-01 00:00:00' and rappro = 0; update llx_bank set dateo = datec where datev = '1970-01-01 00:00:00' and rappro = 0; +alter table llx_c_chargesociales add column actioncompta varchar(12) NOT NULL; +insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values ( 1, 'Allocations familiales', 1,1,'TAXFAM'); +insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values ( 2, 'GSG Deductible', 1,1,'TAXCSGD'); +insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values ( 3, 'GSG/CRDS NON Deductible',0,1,'TAXCSGND'); +insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (10, 'Taxe apprenttissage', 0,1,'TAXAPP'); +insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (11, 'Taxe professionnelle', 0,1,'TAXPRO'); +insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (20, 'Impots locaux/fonciers', 0,1,'TAXFON'); +insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (30, 'Assurance Sante (SECU-URSSAF)', 0,1,'TAXSECU'); +insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (40, 'Mutuelle', 0,1,'TAXMUT'); +insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (50, 'Assurance vieillesse (CNAV)', 0,1,'TAXRET'); +insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (60, 'Assurance Chomage (ASSEDIC)', 0,1,'TAXSECU'); +update llx_c_chargesociales set actioncompta='TAXFAM' where id = 1; +update llx_c_chargesociales set actioncompta='TAXCSGD' where id = 2; +update llx_c_chargesociales set actioncompta='TAXCSGND' where id = 3; +update llx_c_chargesociales set actioncompta='TAXAPP' where id = 10; +update llx_c_chargesociales set actioncompta='TAXPRO' where id = 11; +update llx_c_chargesociales set actioncompta='TAXFON' where id = 20; insert into llx_rights_def (id, libelle, module, type, bydefault, subperms, perms) values (114,'Rapprocher transactions','banque','w',0,null,'consolidate'); update llx_rights_def set libelle='Créer/modifier/supprimer écriture bancaire' where perms='modifier' AND module='banque'; diff --git a/mysql/tables/llx_c_chargesociales.sql b/mysql/tables/llx_c_chargesociales.sql index e38b4133014..3fa776b85f5 100644 --- a/mysql/tables/llx_c_chargesociales.sql +++ b/mysql/tables/llx_c_chargesociales.sql @@ -23,10 +23,11 @@ create table llx_c_chargesociales ( - id integer AUTO_INCREMENT PRIMARY KEY, - libelle varchar(80), - deductible smallint DEFAULT 0 NOT NULL, - active tinyint DEFAULT 1 NOT NULL + id integer AUTO_INCREMENT PRIMARY KEY, + libelle varchar(80), + deductible smallint DEFAULT 0 NOT NULL, + active tinyint DEFAULT 1 NOT NULL, + actioncompta varchar(12) NOT NULL )type=innodb;