diff --git a/htdocs/install/mysql/migration/2.8.0-2.9.0.sql b/htdocs/install/mysql/migration/2.8.0-2.9.0.sql index d9c7084c74a..38f47661e01 100755 --- a/htdocs/install/mysql/migration/2.8.0-2.9.0.sql +++ b/htdocs/install/mysql/migration/2.8.0-2.9.0.sql @@ -45,3 +45,11 @@ alter table llx_facturedet_rec add column total_localtax2 double(24,8) DEFAULT 0 alter table llx_c_tva add column localtax1 double NOT NULL DEFAULT 0 after taux; alter table llx_c_tva add column localtax2 double NOT NULL DEFAULT 0 after localtax1; + +alter table llx_propal add column localtax1 double(24,8) DEFAULT 0 after tva; +alter table llx_propal add column localtax2 double(24,8) DEFAULT 0 after localtax1; +alter table llx_propaldet add column localtax1_tx double(6,3) DEFAULT 0 after tva_tx; +alter table llx_propaldet add column localtax2_tx double(6,3) DEFAULT 0 after localtax1_tx; +alter table llx_propaldet add column total_localtax1 double(24,8) DEFAULT 0 after total_tva; +alter table llx_propaldet add column total_localtax2 double(24,8) DEFAULT 0 after total_localtax1; + diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql index 16ae13288fc..6777ecf4f74 100644 --- a/htdocs/install/mysql/tables/llx_propal.sql +++ b/htdocs/install/mysql/tables/llx_propal.sql @@ -1,6 +1,7 @@ -- =================================================================== -- Copyright (C) 2001-2003 Rodolphe Quiedeville -- Copyright (C) 2005-2009 Regis Houssin +-- Copyright (C) 2010 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 @@ -43,6 +44,8 @@ create table llx_propal remise real DEFAULT 0, -- remise calculee (obsolete) total_ht double(24,8) DEFAULT 0, -- montant total ht apres remise globale tva double(24,8) DEFAULT 0, -- montant total tva apres remise globale + localtax1 double(24,8) DEFAULT 0, -- amount total localtax1 + localtax2 double(24,8) DEFAULT 0, -- amount total localtax2 total double(24,8) DEFAULT 0, -- montant total ttc apres remise globale fk_cond_reglement integer, -- condition de reglement (30 jours, fin de mois ...) diff --git a/htdocs/install/mysql/tables/llx_propaldet.sql b/htdocs/install/mysql/tables/llx_propaldet.sql index 9a0377c7aaf..5e994490e16 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.sql @@ -1,5 +1,6 @@ -- =================================================================== -- Copyright (C) 2002-2003 Rodolphe Quiedeville +-- Copyright (C) 2010 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 @@ -26,6 +27,8 @@ 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 qty real, -- quantity remise_percent real DEFAULT 0, -- pourcentage de remise remise real DEFAULT 0, -- montant de la remise (obsolete) @@ -33,6 +36,8 @@ create table llx_propaldet subprice double(24,8) DEFAULT 0, -- prix unitaire article total_ht double(24,8) DEFAULT 0, -- Total HT de la ligne toute quantite et incluant remise ligne et globale total_tva double(24,8) DEFAULT 0, -- Total TVA de la ligne toute quantite et incluant remise ligne et globale + total_localtax1 double(24,8) DEFAULT 0, -- Total localtax1 + total_localtax2 double(24,8) DEFAULT 0, -- Total localtax2 total_ttc double(24,8) DEFAULT 0, -- Total TTC de la ligne toute quantite et incluant remise ligne et globale product_type integer DEFAULT 0, date_start datetime DEFAULT NULL, -- date debut si service