From ea639559ad0188e9c27c9541ef1459bdcf38636b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 1 Nov 2005 14:37:03 +0000 Subject: [PATCH] Mise a jour table des taux de TVA --- mysql/data/data.sql | 67 +++++++++++++++++++++++----- mysql/migration/1.1.0-2.0.0.sql | 79 +++++++++++++++++++++++++++------ mysql/tables/llx_c_pays.key.sql | 26 +++++++++++ mysql/tables/llx_c_pays.sql | 7 ++- mysql/tables/llx_c_tva.sql | 4 +- 5 files changed, 154 insertions(+), 29 deletions(-) create mode 100644 mysql/tables/llx_c_pays.key.sql diff --git a/mysql/data/data.sql b/mysql/data/data.sql index bec7b09de7a..52d2b65942c 100644 --- a/mysql/data/data.sql +++ b/mysql/data/data.sql @@ -721,18 +721,65 @@ insert into llx_c_currencies ( code, code_iso, active, label ) values ( 'LK', 'L -- -- Taux TVA +-- Source des taux: http://fr.wikipedia.org/wiki/Taxe_sur_la_valeur_ajout%C3%A9e -- -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 1,1, '0','0','Taux à 0 ou non applicable (France, TOM)',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 2,1, '5.5','0','Taux à 5.5 (France hors DOM-TOM)',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 3,1, '8.5','0','Taux à 8.5 (DOM sauf Guyane et Saint-Martin)',0); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 4,1, '8.5','1','Taux à 8.5 (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par l\'acheteur',0); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 5,1,'19.6','0','Taux à 19.6 (France hors DOM-TOM)',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 6,2, '0','0','Taux à 0 ou non applicable',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 7,2, '6','0','Taux à 6',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 8,2, '21','0','Taux à 21',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 9,7, '0','0','VAT Rate 0',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (10,7,'17.5','0','VAT Rate 17.5',1); +delete from llx_c_tva; + +-- ALLEMAGNE (id 5) +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 51, 5, '16','0','VAT Rate 16',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 52, 5, '7','0','VAT Rate 7',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 53, 5, '0','0','VAT Rate 0',1); + +-- BELGIQUE (id 2) +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 21, 2, '21','0','VAT Rate 21',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 22, 2, '6','0','VAT Rate 6',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 23, 2, '0','0','VAT Rate 0 ou non applicable',1); + +-- CANADA (id 14) +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (141,14, '7','0','VAT Rate 7',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (142,14, '0','0','VAT Rate 0',1); + +-- ESPAGNE (id 4) +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 41, 4, '16','0','VAT Rate 16',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 42, 4, '7','0','VAT Rate 7',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 43, 4, '4','0','VAT Rate 4',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 44, 4, '0','0','VAT Rate 0',1); + +-- ITALY (id 3) +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 31, 3, '20','0','VAT Rate 20',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 32, 3, '10','0','VAT Rate 10',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 33, 3, '4','0','VAT Rate 4',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 34, 3, '0','0','VAT Rate 0',1); + +-- FRANCE (id 1) +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 11, 1,'19.6','0','VAT Rate 19.6 (France hors DOM-TOM)',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 12, 1, '8.5','0','VAT Rate 8.5 (DOM sauf Guyane et Saint-Martin)',0); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 13, 1, '8.5','1','VAT Rate 8.5 (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par l\'acheteur',0); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 14, 1, '5.5','0','VAT Rate 5.5 (France hors DOM-TOM)',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 15, 1, '0','0','VAT Rate 0 ou non applicable (France, TOM)',1); + +-- PAYS-BAS (id 17) +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (171,17, '19','0','VAT Rate 19',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (172,17, '6','0','VAT Rate 6',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (173,17, '0','0','VAT Rate 0',1); + +-- PORTUGAL (id 26) +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (261,26, '17','0','VAT Rate 17',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (262,26, '12','0','VAT Rate 12',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (263,26, '0','0','VAT Rate 0',1); + +-- ROYAUME UNI (id 7) +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 71, 7,'17.5','0','VAT Rate 17.5',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 72, 7, '5','0','VAT Rate 5',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 73, 7, '0','0','VAT Rate 0',1); + +-- SUISSE (id 6) +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 61, 6, '7.6','0','VAT Rate 7.6',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 62, 6, '3.6','0','VAT Rate 3.6',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 63, 6, '2.4','0','VAT Rate 2.4',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 64, 6, '0','0','VAT Rate 0',1); + -- diff --git a/mysql/migration/1.1.0-2.0.0.sql b/mysql/migration/1.1.0-2.0.0.sql index 6614b8dd6d1..efd0f6705bf 100644 --- a/mysql/migration/1.1.0-2.0.0.sql +++ b/mysql/migration/1.1.0-2.0.0.sql @@ -12,21 +12,66 @@ create table llx_c_tva ( rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, fk_pays integer NOT NULL, - taux double NOT NULL, - recuperableonly integer DEFAULT 0, + taux double NOT NULL, + recuperableonly integer NOT NULL DEFAULT 0, note varchar(128), active tinyint DEFAULT 1 NOT NULL )type=innodb; -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1,1, '0','0','Taux TVA non applicable (France, TOM)',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2,1, '5.5','0','Taux à 5.5 (France hors DOM-TOM)',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (3,1, '8.5','0','Taux à 8.5 (DOM sauf Guyane et Saint-Martin)',0); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (4,1, '8.5','1','Taux à 8.5 (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par l\'acheteur',0); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (5,1,'19.6','0','Taux à 19.6 (France hors DOM-TOM)',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (6,2, '0','0','Taux TVA non applicable',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (7,2, '6','0','Taux à 6',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (8,2, '21','0','Taux à 21',1); +-- ALLEMAGNE (id 5) +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 51, 5, '16','0','VAT Rate 16',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 52, 5, '7','0','VAT Rate 7',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 53, 5, '0','0','VAT Rate 0',1); + +-- BELGIQUE (id 2) +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 21, 2, '21','0','VAT Rate 21',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 22, 2, '6','0','VAT Rate 6',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 23, 2, '0','0','VAT Rate 0 ou non applicable',1); + +-- CANADA (id 14) +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (141,14, '7','0','VAT Rate 7',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (142,14, '0','0','VAT Rate 0',1); + +-- ESPAGNE (id 4) +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 41, 4, '16','0','VAT Rate 16',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 42, 4, '7','0','VAT Rate 7',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 43, 4, '4','0','VAT Rate 4',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 44, 4, '0','0','VAT Rate 0',1); + +-- ITALY (id 3) +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 31, 3, '20','0','VAT Rate 20',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 32, 3, '10','0','VAT Rate 10',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 33, 3, '4','0','VAT Rate 4',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 34, 3, '0','0','VAT Rate 0',1); + +-- FRANCE (id 1) +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 11, 1,'19.6','0','VAT Rate 19.6 (France hors DOM-TOM)',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 12, 1, '8.5','0','VAT Rate 8.5 (DOM sauf Guyane et Saint-Martin)',0); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 13, 1, '8.5','1','VAT Rate 8.5 (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par l\'acheteur',0); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 14, 1, '5.5','0','VAT Rate 5.5 (France hors DOM-TOM)',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 15, 1, '0','0','VAT Rate 0 ou non applicable (France, TOM)',1); + +-- PAYS-BAS (id 17) +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (171,17, '19','0','VAT Rate 19',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (172,17, '6','0','VAT Rate 6',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (173,17, '0','0','VAT Rate 0',1); + +-- PORTUGAL (id 26) +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (261,26, '17','0','VAT Rate 17',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (262,26, '12','0','VAT Rate 12',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (263,26, '0','0','VAT Rate 0',1); + +-- ROYAUME UNI (id 7) +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 71, 7,'17.5','0','VAT Rate 17.5',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 72, 7, '5','0','VAT Rate 5',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 73, 7, '0','0','VAT Rate 0',1); + +-- SUISSE (id 6) +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 61, 6, '7.6','0','VAT Rate 7.6',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 62, 6, '3.6','0','VAT Rate 3.6',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 63, 6, '2.4','0','VAT Rate 2.4',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 64, 6, '0','0','VAT Rate 0',1); create table llx_user_clicktodial @@ -1471,12 +1516,19 @@ drop table if exists llx_c_pays; create table llx_c_pays ( - rowid integer PRIMARY KEY, - code varchar(6) UNIQUE NOT NULL, + rowid integer PRIMARY KEY, + code varchar(2) NOT NULL, libelle varchar(25) NOT NULL, - active tinyint default 1 NOT NULL + active tinyint DEFAULT 1 NOT NULL )type=innodb; +alter table llx_c_pays modify code varchar(2) NOT NULL; +alter table llx_c_pays add code_iso varchar(3) after code; + +ALTER TABLE llx_c_pays ADD UNIQUE INDEX idx_c_pays_code (code); +ALTER TABLE llx_c_pays ADD UNIQUE INDEX idx_c_pays_code_iso (code_iso); +ALTER TABLE llx_c_pays ADD UNIQUE INDEX idx_c_pays_libelle (libelle); + delete from llx_c_pays; insert into llx_c_pays (rowid,code,libelle) values (0, '' , '-' ); insert into llx_c_pays (rowid,code,libelle) values (1, 'FR', 'France' ); @@ -1503,6 +1555,7 @@ insert into llx_c_pays (rowid,code,libelle) values (21, 'CI', 'C insert into llx_c_pays (rowid,code,libelle) values (23, 'SN', 'Sénégal' ); insert into llx_c_pays (rowid,code,libelle) values (24, 'AR', 'Argentine' ); insert into llx_c_pays (rowid,code,libelle) values (25, 'CM', 'Cameroun' ); +insert into llx_c_pays (rowid,code,libelle) values (26, 'PT', 'Portugal' ); drop table if exists llx_c_propalst; diff --git a/mysql/tables/llx_c_pays.key.sql b/mysql/tables/llx_c_pays.key.sql new file mode 100644 index 00000000000..310e28345fb --- /dev/null +++ b/mysql/tables/llx_c_pays.key.sql @@ -0,0 +1,26 @@ +-- ======================================================================== +-- Copyright (C) 2005 Laurent Destailleur +-- +-- $Id$ +-- $Source$ +-- +-- 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 2 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, write to the Free Software +-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- +-- ======================================================================== + + +ALTER TABLE llx_c_pays ADD UNIQUE INDEX idx_c_pays_code (code); +ALTER TABLE llx_c_pays ADD UNIQUE INDEX idx_c_pays_code_iso (code_iso); +ALTER TABLE llx_c_pays ADD UNIQUE INDEX idx_c_pays_libelle (libelle); diff --git a/mysql/tables/llx_c_pays.sql b/mysql/tables/llx_c_pays.sql index cdbbd83721a..019f604d717 100644 --- a/mysql/tables/llx_c_pays.sql +++ b/mysql/tables/llx_c_pays.sql @@ -23,10 +23,9 @@ create table llx_c_pays ( - rowid integer PRIMARY KEY, - code varchar(6) UNIQUE NOT NULL, + rowid integer PRIMARY KEY, + code varchar(2) NOT NULL, + code_iso varchar(3) , libelle varchar(25) NOT NULL, active tinyint DEFAULT 1 NOT NULL )type=innodb; - - diff --git a/mysql/tables/llx_c_tva.sql b/mysql/tables/llx_c_tva.sql index 0f7e1c8b276..917017c1084 100644 --- a/mysql/tables/llx_c_tva.sql +++ b/mysql/tables/llx_c_tva.sql @@ -24,8 +24,8 @@ create table llx_c_tva ( rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, fk_pays integer NOT NULL, - taux double NOT NULL, - recuperableonly integer DEFAULT 0, + taux double NOT NULL, + recuperableonly integer NOT NULL DEFAULT 0, note varchar(128), active tinyint DEFAULT 1 NOT NULL