From d4f81a9ee7eb22b60be292221da9641f5894bd44 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 27 Dec 2012 12:51:38 +0100 Subject: [PATCH] Fix: Predefined invoice feature was broken. --- htdocs/install/mysql/migration/3.2.0-3.3.0.sql | 5 +++++ htdocs/install/mysql/tables/llx_facturedet_rec.sql | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) 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 cab42a60716..1f8a79372df 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 @@ -241,6 +241,11 @@ alter table llx_facturedet add column localtax2_type varchar(1) after localtax2_ ALTER TABLE llx_facturedet MODIFY COLUMN localtax1_type varchar(1); ALTER TABLE llx_facturedet MODIFY COLUMN localtax2_type varchar(1); +alter table llx_facturedet_rec add column localtax1_type varchar(1) after localtax1_tx; +alter table llx_facturedet_rec add column localtax2_type varchar(1) after localtax2_tx; +ALTER TABLE llx_facturedet_rec MODIFY COLUMN localtax1_type varchar(1); +ALTER TABLE llx_facturedet_rec MODIFY COLUMN localtax2_type varchar(1); + alter table llx_propaldet add column localtax1_type varchar(1) after localtax1_tx; alter table llx_propaldet add column localtax2_type varchar(1) after localtax2_tx; ALTER TABLE llx_propaldet MODIFY COLUMN localtax1_type varchar(1); diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec.sql b/htdocs/install/mysql/tables/llx_facturedet_rec.sql index fe40c1fe97e..94d8cfe440c 100644 --- a/htdocs/install/mysql/tables/llx_facturedet_rec.sql +++ b/htdocs/install/mysql/tables/llx_facturedet_rec.sql @@ -29,8 +29,10 @@ create table llx_facturedet_rec label varchar(255) DEFAULT NULL, description text, tva_tx double(6,3) DEFAULT 19.6, -- taux tva - 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 varchar(1) NULL, -- localtax1 type + localtax2_tx double(6,3) DEFAULT 0, -- localtax2 rate + localtax2_type varchar(1) NULL, -- localtax2 type qty real, -- quantity remise_percent real DEFAULT 0, -- pourcentage de remise remise real DEFAULT 0, -- montant de la remise