lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prepare database for local taxes management

Browse Source 
add localtax1_type and localtax2_type in database.
these type are char(1) and support following values :
'0' : local tax not applied
'1' : local tax apply on products and services without vat (vat is not applied on local tax)
'2' : local tax apply on products and services before vat (vat is calculated on amount + localtax)
'3' : local tax apply on products without vat (vat is not applied on local tax)
'4' : local tax apply on products before vat (vat is calculated on amount + localtax)
'5' : local tax apply on services without vat (vat is not applied on local tax)
'6' : local tax apply on services before vat (vat is calculated on amount + localtax)
'7' : local tax is a fix amount applied on global invoice
This commit is contained in:
Christophe Battarel 2012-09-10 11:00:35 +02:00
parent 66af48697c
commit 2e4aa1131a
8 changed files with 47 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/install/mysql/data/llx_c_tva.sql
View File

@ -208,13 +208,13 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 6
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 64, 6, '0','0','VAT Rate 0', 1);
-- TUNISIA (id country=10)
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (101,10, '6','0','VAT 6%', 1);
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (102,10, '12','0','VAT 12%',1);
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (103,10, '18','0','VAT 18%',1);
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (104,10, '7.5','0','VAT 6% Majoré à 25% (7.5%)',1);
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (105,10, '15','0','VAT 12% Majoré à 25% (15%)',1);
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (106,10, '22.5','0','VAT 18% Majoré à 25% (22.5%)',1);
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (107,10, '0','0','VAT Rate 0', 1);
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,localtax1, localtax1_type, localtax2, localtax2_type) values (101,10, '6','0','VAT 6%', 1, 1, '4', 0.4, '7');
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,localtax1, localtax1_type, localtax2, localtax2_type) values (102,10, '12','0','VAT 12%',1, 1, '4', 0.4, '7');
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,localtax1, localtax1_type, localtax2, localtax2_type) values (103,10, '18','0','VAT 18%',1, 1, '4', 0.4, '7');
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,localtax1, localtax1_type, localtax2, localtax2_type) values (104,10, '7.5','0','VAT 6% Majoré à 25% (7.5%)',1, 1, '4', 0.4, '7');
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,localtax1, localtax1_type, localtax2, localtax2_type) values (105,10, '15','0','VAT 12% Majoré à 25% (15%)',1, 1, '4', 0.4, '7');
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,localtax1, localtax1_type, localtax2, localtax2_type) values (106,10, '22.5','0','VAT 18% Majoré à 25% (22.5%)',1, 1, '4', 0.4, '7');
insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,localtax1, localtax1_type, localtax2, localtax2_type) values (107,10, '0','0','VAT Rate 0', 1, 1, '4', 0.4, '7');
-- UKRAINE (id country=226)
INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2261,226, '20','0','VAT standart rate',1);

20
htdocs/install/mysql/migration/3.2.0-3.3.0.sql
View File

@ -209,3 +209,23 @@ ALTER TABLE llx_boxes DROP INDEX uk_boxes;
ALTER TABLE llx_boxes ADD COLUMN entity integer NOT NULL DEFAULT 1 AFTER rowid;
ALTER TABLE llx_boxes ADD UNIQUE INDEX uk_boxes (entity, box_id, position, fk_user);
UPDATE llx_boxes as b SET b.entity = (SELECT bd.entity FROM llx_boxes_def as bd WHERE bd.rowid = b.box_id);
-- TASK #204
alter table llx_c_tva add column localtax1_type char(1) default '0' after localtax1;
alter table llx_c_tva add column localtax2_type char(1) default '0' after localtax2;
alter table llx_commande_fournisseurdet add column localtax1_type char(1) after localtax1_tx;
alter table llx_commande_fournisseurdet add column localtax2_type char(1) after localtax2_tx;
alter table llx_commandedet add column localtax1_type char(1) after localtax1_tx;
alter table llx_commandedet add column localtax2_type char(1) after localtax2_tx;
alter table llx_facture_fourn_det add column localtax1_type char(1) after localtax1_tx;
alter table llx_facture_fourn_det add column localtax2_type char(1) after localtax2_tx;
alter table llx_facturedet add column localtax1_type char(1) after localtax1_tx;
alter table llx_facturedet add column localtax2_type char(1) after localtax2_tx;
alter table llx_propaldet add column localtax1_type char(1) after localtax1_tx;
alter table llx_propaldet add column localtax2_type char(1) after localtax2_tx;
-- END TASK #204

2
htdocs/install/mysql/tables/llx_c_tva.sql
View File

@ -23,7 +23,9 @@ create table llx_c_tva
fk_pays integer NOT NULL,
taux double NOT NULL,
localtax1 double NOT NULL DEFAULT 0,
localtax1_type char(1) NOT NULL DEFAULT '0',
localtax2 double NOT NULL DEFAULT 0,
localtax2_type char(1) NOT NULL DEFAULT '0',
recuperableonly integer NOT NULL DEFAULT 0,
note varchar(128),
active tinyint DEFAULT 1 NOT NULL,

2
htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql
View File

@ -28,7 +28,9 @@ create table llx_commande_fournisseurdet
description text,
tva_tx double(6,3) DEFAULT 0, -- taux tva
localtax1_tx double(6,3) DEFAULT 0, -- localtax1 rate
localtax1_type char(1) NULL, -- localtax1 type
localtax2_tx double(6,3) DEFAULT 0, -- localtax2 rate
localtax2_type char(1) NULL, -- localtax2 type
qty real, -- quantity
remise_percent real DEFAULT 0, -- pourcentage de remise
remise real DEFAULT 0, -- montant de la remise

6
htdocs/install/mysql/tables/llx_commandedet.sql
View File

@ -28,8 +28,10 @@ create table llx_commandedet
label varchar(255) DEFAULT NULL,
description text,
tva_tx double(6,3), -- vat rate
localtax1_tx double(6,3), -- localtax1 rate
localtax2_tx double(6,3), -- localtax2 rate
localtax1_tx double(6,3) DEFAULT 0, -- localtax1 rate
localtax1_type char(1) NULL, -- localtax1 type
localtax2_tx double(6,3) DEFAULT 0, -- localtax2 rate
localtax2_type char(1) NULL, -- localtax2 type
qty real, -- quantity
remise_percent real DEFAULT 0, -- pourcentage de remise
remise real DEFAULT 0, -- montant de la remise

6
htdocs/install/mysql/tables/llx_facture_fourn_det.sql
View File

@ -30,8 +30,10 @@ create table llx_facture_fourn_det
pu_ttc double(24,8), -- unit price with tax
qty real, -- quantity of product/service
tva_tx double(6,3), -- TVA taux product/service
localtax1_tx double(6,3) DEFAULT 0, -- tax local tax 1
localtax2_tx double(6,3) DEFAULT 0, -- tax local tax 2
localtax1_tx double(6,3) DEFAULT 0, -- localtax1 rate
localtax1_type char(1) NULL, -- localtax1 type
localtax2_tx double(6,3) DEFAULT 0, -- localtax2 rate
localtax2_type char(1) NULL, -- localtax2 type
total_ht double(24,8), -- Total line price of product excluding tax
tva double(24,8), -- Total TVA of line
total_localtax1 double(24,8) DEFAULT 0, -- Total LocalTax1 for total quantity of line

6
htdocs/install/mysql/tables/llx_facturedet.sql
View File

@ -29,8 +29,10 @@ create table llx_facturedet
label varchar(255) DEFAULT NULL,
description text,
tva_tx double(6,3), -- Taux tva produit/service (exemple 19.6)
localtax1_tx double(6,3) DEFAULT 0, -- tax local tax 1
localtax2_tx double(6,3) DEFAULT 0, -- tax local tax 2
localtax1_tx double(6,3) DEFAULT 0, -- localtax1 rate
localtax1_type char(1) NULL, -- localtax1 type
localtax2_tx double(6,3) DEFAULT 0, -- localtax2 rate
localtax2_type char(1) NULL, -- localtax2 type
qty real, -- Quantity (exemple 2)
remise_percent real DEFAULT 0, -- % de la remise ligne (exemple 20%)
remise real DEFAULT 0, -- Montant calcule de la remise % sur PU HT (exemple 20)

6
htdocs/install/mysql/tables/llx_propaldet.sql
View File

@ -28,8 +28,10 @@ create table llx_propaldet
description text,
fk_remise_except integer NULL, -- Lien vers table des remises fixes
tva_tx double(6,3) DEFAULT 0, -- taux tva
localtax1_tx double(6,3) DEFAULT 0, -- localtax1 tax
localtax2_tx double(6,3) DEFAULT 0, -- localtax2 tax
localtax1_tx double(6,3) DEFAULT 0, -- localtax1 rate
localtax1_type char(1) NULL, -- localtax1 type
localtax2_tx double(6,3) DEFAULT 0, -- localtax2 rate
localtax2_type char(1) NULL, -- localtax2 type
qty real, -- quantity
remise_percent real DEFAULT 0, -- pourcentage de remise
remise real DEFAULT 0, -- montant de la remise (obsolete)