diff --git a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql index b3353d1b526..7c92341271b 100755 --- a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql +++ b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql @@ -250,6 +250,11 @@ alter table llx_propaldet add column localtax1_type varchar(1) after localtax1_t alter table llx_propaldet add column localtax2_type varchar(1) after localtax2_tx; ALTER TABLE llx_propaldet MODIFY COLUMN localtax1_type varchar(1); ALTER TABLE llx_propaldet MODIFY COLUMN localtax2_type varchar(1); + +alter table llx_contratdet add column localtax1_type varchar(1) after localtax1_tx; +alter table llx_contratdet add column localtax2_type varchar(1) after localtax2_tx; +ALTER TABLE llx_contratdet MODIFY COLUMN localtax1_type varchar(1); +ALTER TABLE llx_contratdet MODIFY COLUMN localtax2_type varchar(1); -- END TASK #204 ALTER TABLE llx_menu MODIFY COLUMN enabled varchar(255) NULL DEFAULT '1'; diff --git a/htdocs/install/mysql/tables/llx_contratdet.sql b/htdocs/install/mysql/tables/llx_contratdet.sql index fd71eb23e96..a990d94ce4b 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.sql @@ -1,6 +1,6 @@ -- ============================================================================ --- Copyright (C) 2004 Rodolphe Quiedeville --- Copyright (C) 2010 Juanjo Menent +-- Copyright (C) 2004 Rodolphe Quiedeville +-- Copyright (C) 2010-2013 Juanjo Menent -- -- 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 @@ -39,7 +39,9 @@ create table llx_contratdet tva_tx double(6,3) DEFAULT 0, -- taux tva localtax1_tx double(6,3) DEFAULT 0, -- local tax 1 rate + localtax1_type varchar(1) NULL, -- localtax1 type localtax2_tx double(6,3) DEFAULT 0, -- local tax 2 rate + localtax2_type varchar(1) NULL, -- localtax2 type qty real NOT NULL, -- quantity remise_percent real DEFAULT 0, -- pourcentage de remise subprice double(24,8) DEFAULT 0, -- prix unitaire