From 547b7d5f91f6f79cb620322fa62255be5ced3a3b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 7 Apr 2015 18:14:20 +0200 Subject: [PATCH] Fix #2539 --- htdocs/install/mysql/migration/3.7.0-3.8.0.sql | 5 +++-- htdocs/install/mysql/tables/llx_commande.sql | 4 +++- htdocs/install/mysql/tables/llx_commande_fournisseur.sql | 2 ++ htdocs/install/mysql/tables/llx_expedition.sql | 4 +++- htdocs/install/mysql/tables/llx_facture.sql | 3 +++ htdocs/install/mysql/tables/llx_facture_fourn.sql | 8 +++++--- htdocs/install/mysql/tables/llx_livraison.sql | 4 +++- htdocs/install/mysql/tables/llx_propal.sql | 2 ++ htdocs/install/mysql/tables/llx_societe.sql | 2 ++ 9 files changed, 26 insertions(+), 8 deletions(-) diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql index d8f47651153..6af1a0fe647 100644 --- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql +++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql @@ -378,6 +378,9 @@ CREATE TABLE llx_askpricesupplierdet_extrafields ( -- End Module AskPriceSupplier -- +ALTER TABLE llx_commande_fournisseur ADD COLUMN date_approve2 datetime after date_approve; +ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_user_approve2 integer after fk_user_approve; + ALTER TABLE llx_societe ADD COLUMN fk_incoterms integer; ALTER TABLE llx_societe ADD COLUMN location_incoterms varchar(255); ALTER TABLE llx_propal ADD COLUMN fk_incoterms integer; @@ -386,8 +389,6 @@ ALTER TABLE llx_commande ADD COLUMN fk_incoterms integer; ALTER TABLE llx_commande ADD COLUMN location_incoterms varchar(255); ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_incoterms integer; ALTER TABLE llx_commande_fournisseur ADD COLUMN location_incoterms varchar(255); -ALTER TABLE llx_commande_fournisseur ADD COLUMN date_approve2 datetime after date_approve; -ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_user_approve2 integer after fk_user_approve; ALTER TABLE llx_facture ADD COLUMN fk_incoterms integer; ALTER TABLE llx_facture ADD COLUMN location_incoterms varchar(255); ALTER TABLE llx_facture_fourn ADD COLUMN fk_incoterms integer; diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql index 7bf22df1a1d..3511aa7ec78 100644 --- a/htdocs/install/mysql/tables/llx_commande.sql +++ b/htdocs/install/mysql/tables/llx_commande.sql @@ -62,10 +62,12 @@ create table llx_commande fk_mode_reglement integer, -- mode de reglement date_livraison date default NULL, - fk_shipping_method integer, -- shipping method id + fk_shipping_method integer, -- shipping method id fk_availability integer NULL, fk_input_reason integer, -- id coming from c_input_reason, '0' if no defined fk_delivery_address integer, -- delivery address (deprecated) + fk_incoterms integer, -- for incoterms + location_incoterms varchar(255), -- for incoterms import_key varchar(14), extraparams varchar(255) -- for stock other parameters with json format diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql index 247c8e8d6af..33588d8bf66 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql @@ -62,6 +62,8 @@ create table llx_commande_fournisseur fk_cond_reglement integer, -- condition de reglement fk_mode_reglement integer, -- mode de reglement fk_input_method integer default 0, -- id coming from c_input_reason, '0' if no defined + fk_incoterms integer, -- for incoterms + location_incoterms varchar(255), -- for incoterms import_key varchar(14), extraparams varchar(255) -- for stock other parameters with json format diff --git a/htdocs/install/mysql/tables/llx_expedition.sql b/htdocs/install/mysql/tables/llx_expedition.sql index 0a152b13069..d142a5cc628 100644 --- a/htdocs/install/mysql/tables/llx_expedition.sql +++ b/htdocs/install/mysql/tables/llx_expedition.sql @@ -50,6 +50,8 @@ create table llx_expedition weight float, -- weight note_private text, note_public text, - model_pdf varchar(255) + model_pdf varchar(255), + fk_incoterms integer, -- for incoterms + location_incoterms varchar(255) -- for incoterms )ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql index eada5b46c2e..93a376c599c 100644 --- a/htdocs/install/mysql/tables/llx_facture.sql +++ b/htdocs/install/mysql/tables/llx_facture.sql @@ -75,6 +75,9 @@ create table llx_facture note_private text, note_public text, model_pdf varchar(255), + + fk_incoterms integer, -- for incoterms + location_incoterms varchar(255), -- for incoterms import_key varchar(14), extraparams varchar(255), -- for stock other parameters with json format diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.sql b/htdocs/install/mysql/tables/llx_facture_fourn.sql index 33773b7a9cb..703b86841f9 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.sql @@ -60,12 +60,14 @@ create table llx_facture_fourn fk_projet integer, -- projet auquel est associee la facture fk_account integer, -- bank account - fk_cond_reglement integer, -- condition de reglement (30 jours, fin de mois ...) - fk_mode_reglement integer, -- mode de reglement (CHQ, VIR, ...) - date_lim_reglement date, -- date limite de reglement + fk_cond_reglement integer, -- condition de reglement (30 jours, fin de mois ...) + fk_mode_reglement integer, -- mode de reglement (CHQ, VIR, ...) + date_lim_reglement date, -- date limite de reglement note_private text, note_public text, + fk_incoterms integer, -- for incoterms + location_incoterms varchar(255), -- for incoterms model_pdf varchar(255), import_key varchar(14), extraparams varchar(255) -- for stock other parameters with json format diff --git a/htdocs/install/mysql/tables/llx_livraison.sql b/htdocs/install/mysql/tables/llx_livraison.sql index 486212158aa..ed97eb33f94 100644 --- a/htdocs/install/mysql/tables/llx_livraison.sql +++ b/htdocs/install/mysql/tables/llx_livraison.sql @@ -39,6 +39,8 @@ create table llx_livraison total_ht double(24,8) DEFAULT 0, note_private text, note_public text, - model_pdf varchar(255) + model_pdf varchar(255), + fk_incoterms integer, -- for incoterms + location_incoterms varchar(255) -- for incoterms )ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql index 90996073021..8090b1fcb4d 100644 --- a/htdocs/install/mysql/tables/llx_propal.sql +++ b/htdocs/install/mysql/tables/llx_propal.sql @@ -65,6 +65,8 @@ create table llx_propal fk_shipping_method integer, -- shipping method id fk_availability integer NULL, fk_input_reason integer, + fk_incoterms integer, -- for incoterms + location_incoterms varchar(255), -- for incoterms import_key varchar(14), extraparams varchar(255), -- for stock other parameters with json format fk_delivery_address integer -- delivery address (deprecated) diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql index e28cf062224..b3464f9fc1f 100644 --- a/htdocs/install/mysql/tables/llx_societe.sql +++ b/htdocs/install/mysql/tables/llx_societe.sql @@ -70,6 +70,8 @@ create table llx_societe fournisseur tinyint DEFAULT 0, -- fournisseur 0/1 supplier_account varchar(32), -- compte client chez un fournisseur fk_prospectlevel varchar(12), -- prospect level (in llx_c_prospectlevel) + fk_incoterms integer, -- for incoterms + location_incoterms varchar(255), -- for incoterms customer_bad tinyint DEFAULT 0, -- mauvais payeur 0/1 customer_rate real DEFAULT 0, -- taux fiabilite client (0 a 1) supplier_rate real DEFAULT 0, -- taux fiabilite fournisseur (0 a 1)