diff --git a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql index cb6bfa46889..01204e0bd55 100644 --- a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql +++ b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql @@ -454,6 +454,40 @@ INSERT INTO llx_c_paiement (id,code,libelle,type,active) values (102, 'BAN', 'Ba INSERT INTO llx_c_paiement (id,code,libelle,type,active) values (103, 'IDE', 'iDeal', 1, 0); INSERT INTO llx_c_paiement (id,code,libelle,type,active) values (104, 'GIR', 'Giropay', 1, 0); +ALTER TABLE llx_paiement_facture ADD COLUMN multicurrency_code varchar(3); +ALTER TABLE llx_paiement_facture ADD COLUMN multicurrency_tx double(24,8) DEFAULT 1; +ALTER TABLE llx_paiement_facture ADD COLUMN multicurrency_amount double(24,8) DEFAULT 0; + +ALTER TABLE llx_paiementfourn_facturefourn ADD COLUMN multicurrency_code varchar(3); +ALTER TABLE llx_paiementfourn_facturefourn ADD COLUMN multicurrency_tx double(24,8) DEFAULT 1; +ALTER TABLE llx_paiementfourn_facturefourn ADD COLUMN multicurrency_amount double(24,8) DEFAULT 0; + + +ALTER TABLE llx_commande_fournisseur MODIFY COLUMN multicurrency_code varchar(3); +ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN multicurrency_code varchar(3); +ALTER TABLE llx_commande MODIFY COLUMN multicurrency_code varchar(3); +ALTER TABLE llx_commandedet MODIFY COLUMN multicurrency_code varchar(3); +ALTER TABLE llx_contratdet MODIFY COLUMN multicurrency_code varchar(3); +ALTER TABLE llx_expensereport_det MODIFY COLUMN multicurrency_code varchar(3); +ALTER TABLE llx_expensereport MODIFY COLUMN multicurrency_code varchar(3); +ALTER TABLE llx_facture_fourn_det MODIFY COLUMN multicurrency_code varchar(3); +ALTER TABLE llx_facture_fourn MODIFY COLUMN multicurrency_code varchar(3); +ALTER TABLE llx_facture_rec MODIFY COLUMN multicurrency_code varchar(3); +ALTER TABLE llx_facture MODIFY COLUMN multicurrency_code varchar(3); +ALTER TABLE llx_facturedet_rec MODIFY COLUMN multicurrency_code varchar(3); +ALTER TABLE llx_facturedet MODIFY COLUMN multicurrency_code varchar(3); +ALTER TABLE llx_paiement_facture MODIFY COLUMN multicurrency_code varchar(3); +ALTER TABLE llx_paiementfourn_facturefourn MODIFY COLUMN multicurrency_code varchar(3); +ALTER TABLE llx_product_fournisseur_price_log MODIFY COLUMN multicurrency_code varchar(3); +ALTER TABLE llx_product_fournisseur_price MODIFY COLUMN multicurrency_code varchar(3); +ALTER TABLE llx_product_price_by_qty MODIFY COLUMN multicurrency_code varchar(3); +ALTER TABLE llx_product_price MODIFY COLUMN multicurrency_code varchar(3); +ALTER TABLE llx_propal MODIFY COLUMN multicurrency_code varchar(3); +ALTER TABLE llx_propaldet MODIFY COLUMN multicurrency_code varchar(3); +ALTER TABLE llx_societe MODIFY COLUMN multicurrency_code varchar(3); +ALTER TABLE llx_supplier_proposal MODIFY COLUMN multicurrency_code varchar(3); +ALTER TABLE llx_supplier_proposaldet MODIFY COLUMN multicurrency_code varchar(3); + ALTER TABLE llx_propal ADD COLUMN online_sign_ip varchar(48); ALTER TABLE llx_propal ADD COLUMN online_sign_name varchar(64); diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql index e3a075933c2..5b8a78c7bf8 100644 --- a/htdocs/install/mysql/tables/llx_commande.sql +++ b/htdocs/install/mysql/tables/llx_commande.sql @@ -77,7 +77,7 @@ create table llx_commande extraparams varchar(255), -- for stock other parameters with json format fk_multicurrency integer, - multicurrency_code varchar(255), + multicurrency_code varchar(3), multicurrency_tx double(24,8) DEFAULT 1, multicurrency_total_ht double(24,8) DEFAULT 0, multicurrency_total_tva double(24,8) DEFAULT 0, diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql index 56486b551c8..e7d1d7b6c1d 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql @@ -70,7 +70,7 @@ create table llx_commande_fournisseur extraparams varchar(255), -- for stock other parameters with json format fk_multicurrency integer, - multicurrency_code varchar(255), + multicurrency_code varchar(3), multicurrency_tx double(24,8) DEFAULT 1, multicurrency_total_ht double(24,8) DEFAULT 0, multicurrency_total_tva double(24,8) DEFAULT 0, diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql index b780d24f1e2..f6092bc4c74 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql @@ -53,7 +53,7 @@ create table llx_commande_fournisseurdet fk_unit integer DEFAULT NULL, fk_multicurrency integer, - multicurrency_code varchar(255), + multicurrency_code varchar(3), multicurrency_subprice double(24,8) DEFAULT 0, multicurrency_total_ht double(24,8) DEFAULT 0, multicurrency_total_tva double(24,8) DEFAULT 0, diff --git a/htdocs/install/mysql/tables/llx_commandedet.sql b/htdocs/install/mysql/tables/llx_commandedet.sql index caff1ce7028..d269e2ddfe2 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.sql @@ -62,7 +62,7 @@ create table llx_commandedet fk_commandefourndet integer DEFAULT NULL, -- link to detail line of commande fourn (resplenish) fk_multicurrency integer, - multicurrency_code varchar(255), + multicurrency_code varchar(3), multicurrency_subprice double(24,8) DEFAULT 0, multicurrency_total_ht double(24,8) DEFAULT 0, multicurrency_total_tva double(24,8) DEFAULT 0, diff --git a/htdocs/install/mysql/tables/llx_contratdet.sql b/htdocs/install/mysql/tables/llx_contratdet.sql index e9be3c4ad0c..075de80270d 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.sql @@ -66,7 +66,7 @@ create table llx_contratdet fk_unit integer DEFAULT NULL, fk_multicurrency integer, - multicurrency_code varchar(255), + multicurrency_code varchar(3), multicurrency_subprice double(24,8) DEFAULT 0, multicurrency_total_ht double(24,8) DEFAULT 0, multicurrency_total_tva double(24,8) DEFAULT 0, diff --git a/htdocs/install/mysql/tables/llx_expensereport.sql b/htdocs/install/mysql/tables/llx_expensereport.sql index 36bd5efb50c..e5c44ec0f36 100644 --- a/htdocs/install/mysql/tables/llx_expensereport.sql +++ b/htdocs/install/mysql/tables/llx_expensereport.sql @@ -56,7 +56,7 @@ CREATE TABLE llx_expensereport ( last_main_doc varchar(255), -- relative filepath+filename of last main generated document fk_multicurrency integer, - multicurrency_code varchar(255), + multicurrency_code varchar(3), multicurrency_tx double(24,8) DEFAULT 1, multicurrency_total_ht double(24,8) DEFAULT 0, multicurrency_total_tva double(24,8) DEFAULT 0, diff --git a/htdocs/install/mysql/tables/llx_expensereport_det.sql b/htdocs/install/mysql/tables/llx_expensereport_det.sql index e6304f64c7f..7855ad16643 100644 --- a/htdocs/install/mysql/tables/llx_expensereport_det.sql +++ b/htdocs/install/mysql/tables/llx_expensereport_det.sql @@ -45,7 +45,7 @@ CREATE TABLE llx_expensereport_det info_bits integer DEFAULT 0, -- TVA NPR ou non special_code integer DEFAULT 0, -- code for special lines fk_multicurrency integer, - multicurrency_code varchar(255), + multicurrency_code varchar(3), multicurrency_subprice double(24,8) DEFAULT 0, multicurrency_total_ht double(24,8) DEFAULT 0, multicurrency_total_tva double(24,8) DEFAULT 0, diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql index 562d29efe97..081213868cc 100644 --- a/htdocs/install/mysql/tables/llx_facture.sql +++ b/htdocs/install/mysql/tables/llx_facture.sql @@ -100,7 +100,7 @@ create table llx_facture extraparams varchar(255), -- for other parameters with json format fk_multicurrency integer, - multicurrency_code varchar(255), + multicurrency_code varchar(3), multicurrency_tx double(24,8) DEFAULT 1, multicurrency_total_ht double(24,8) DEFAULT 0, multicurrency_total_tva double(24,8) DEFAULT 0, diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.sql b/htdocs/install/mysql/tables/llx_facture_fourn.sql index 1b7401898ab..683f15623a6 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.sql @@ -83,7 +83,7 @@ create table llx_facture_fourn extraparams varchar(255), -- for stock other parameters with json format fk_multicurrency integer, - multicurrency_code varchar(255), + multicurrency_code varchar(3), multicurrency_tx double(24,8) DEFAULT 1, multicurrency_total_ht double(24,8) DEFAULT 0, multicurrency_total_tva double(24,8) DEFAULT 0, diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql index 4012fb7087d..30f57fa184b 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql @@ -54,7 +54,7 @@ create table llx_facture_fourn_det fk_unit integer DEFAULT NULL, fk_multicurrency integer, - multicurrency_code varchar(255), + multicurrency_code varchar(3), multicurrency_subprice double(24,8) DEFAULT 0, multicurrency_total_ht double(24,8) DEFAULT 0, multicurrency_total_tva double(24,8) DEFAULT 0, diff --git a/htdocs/install/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql index c3cb6aeed46..bb65ea4b6d8 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.sql @@ -57,7 +57,7 @@ create table llx_facture_rec modelpdf varchar(255), fk_multicurrency integer, - multicurrency_code varchar(255), + multicurrency_code varchar(3), multicurrency_tx double(24,8) DEFAULT 1, multicurrency_total_ht double(24,8) DEFAULT 0, multicurrency_total_tva double(24,8) DEFAULT 0, diff --git a/htdocs/install/mysql/tables/llx_facturedet.sql b/htdocs/install/mysql/tables/llx_facturedet.sql index 5e48b16be09..9fabf237c62 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.sql @@ -70,7 +70,7 @@ create table llx_facturedet fk_user_modif integer, -- user making last change fk_multicurrency integer, - multicurrency_code varchar(255), + multicurrency_code varchar(3), multicurrency_subprice double(24,8) DEFAULT 0, multicurrency_total_ht double(24,8) DEFAULT 0, multicurrency_total_tva double(24,8) DEFAULT 0, diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec.sql b/htdocs/install/mysql/tables/llx_facturedet_rec.sql index f515276c442..c84c517d390 100644 --- a/htdocs/install/mysql/tables/llx_facturedet_rec.sql +++ b/htdocs/install/mysql/tables/llx_facturedet_rec.sql @@ -62,7 +62,7 @@ create table llx_facturedet_rec fk_user_modif integer, -- user making last change fk_multicurrency integer, - multicurrency_code varchar(255), + multicurrency_code varchar(3), multicurrency_subprice double(24,8) DEFAULT 0, multicurrency_total_ht double(24,8) DEFAULT 0, multicurrency_total_tva double(24,8) DEFAULT 0, diff --git a/htdocs/install/mysql/tables/llx_paiement_facture.sql b/htdocs/install/mysql/tables/llx_paiement_facture.sql index f15f651f7ae..1728b698f34 100644 --- a/htdocs/install/mysql/tables/llx_paiement_facture.sql +++ b/htdocs/install/mysql/tables/llx_paiement_facture.sql @@ -23,7 +23,7 @@ create table llx_paiement_facture fk_facture integer, amount double(24,8) DEFAULT 0, - multicurrency_code varchar(255), + multicurrency_code varchar(3), multicurrency_tx double(24,8) DEFAULT 1, multicurrency_amount double(24,8) DEFAULT 0 )ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql index cb1b8441444..ab2e2bfa0f2 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql @@ -25,7 +25,7 @@ create table llx_paiementfourn_facturefourn fk_facturefourn INTEGER DEFAULT NULL, amount double(24,8) DEFAULT 0, - multicurrency_code varchar(255), + multicurrency_code varchar(3), multicurrency_tx double(24,8) DEFAULT 1, multicurrency_amount double(24,8) DEFAULT 0 )ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql index 51b691e8ae2..725d2bb30e2 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql @@ -53,7 +53,7 @@ create table llx_product_fournisseur_price packaging varchar(64), fk_multicurrency integer, - multicurrency_code varchar(255), + multicurrency_code varchar(3), multicurrency_tx double(24,8) DEFAULT 1, multicurrency_unitprice double(24,8) DEFAULT NULL, -- unit price without tax multicurrency_price double(24,8) DEFAULT NULL diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql index cb59cc78bef..fdfc4176c0a 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql @@ -27,7 +27,7 @@ create table llx_product_fournisseur_price_log fk_user integer, fk_multicurrency integer, - multicurrency_code varchar(255), + multicurrency_code varchar(3), multicurrency_tx double(24,8) DEFAULT 1, multicurrency_unitprice double(24,8) DEFAULT NULL, -- unit price without tax multicurrency_price double(24,8) DEFAULT NULL diff --git a/htdocs/install/mysql/tables/llx_product_price.sql b/htdocs/install/mysql/tables/llx_product_price.sql index 9ebbeed9f96..77a00939428 100644 --- a/htdocs/install/mysql/tables/llx_product_price.sql +++ b/htdocs/install/mysql/tables/llx_product_price.sql @@ -48,7 +48,7 @@ create table llx_product_price import_key varchar(14), fk_multicurrency integer, - multicurrency_code varchar(255), + multicurrency_code varchar(3), multicurrency_tx double(24,8) DEFAULT 1, multicurrency_price double(24,8) DEFAULT NULL, multicurrency_price_ttc double(24,8) DEFAULT NULL diff --git a/htdocs/install/mysql/tables/llx_product_price_by_qty.sql b/htdocs/install/mysql/tables/llx_product_price_by_qty.sql index dc3a21bfedb..86cf28244ad 100644 --- a/htdocs/install/mysql/tables/llx_product_price_by_qty.sql +++ b/htdocs/install/mysql/tables/llx_product_price_by_qty.sql @@ -35,7 +35,7 @@ create table llx_product_price_by_qty fk_user_modif integer, fk_multicurrency integer, - multicurrency_code varchar(255), + multicurrency_code varchar(3), multicurrency_tx double(24,8) DEFAULT 1, multicurrency_price double(24,8) DEFAULT NULL, multicurrency_price_ttc double(24,8) DEFAULT NULL, diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql index 15d4e8d4545..3499a51e8b8 100644 --- a/htdocs/install/mysql/tables/llx_propal.sql +++ b/htdocs/install/mysql/tables/llx_propal.sql @@ -81,7 +81,7 @@ create table llx_propal fk_delivery_address integer, -- delivery address (deprecated) fk_multicurrency integer, - multicurrency_code varchar(255), + multicurrency_code varchar(3), multicurrency_tx double(24,8) DEFAULT 1, multicurrency_total_ht double(24,8) DEFAULT 0, multicurrency_total_tva double(24,8) DEFAULT 0, diff --git a/htdocs/install/mysql/tables/llx_propaldet.sql b/htdocs/install/mysql/tables/llx_propaldet.sql index 4dc9d570838..103118d6b77 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.sql @@ -57,7 +57,7 @@ create table llx_propaldet fk_unit integer DEFAULT NULL, -- lien vers table des unités fk_multicurrency integer, - multicurrency_code varchar(255), + multicurrency_code varchar(3), multicurrency_subprice double(24,8) DEFAULT 0, multicurrency_total_ht double(24,8) DEFAULT 0, multicurrency_total_tva double(24,8) DEFAULT 0, diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql index c30c934b792..c8b78d42fae 100644 --- a/htdocs/install/mysql/tables/llx_societe.sql +++ b/htdocs/install/mysql/tables/llx_societe.sql @@ -125,7 +125,7 @@ create table llx_societe fk_user_modif integer, -- utilisateur qui a modifie l'info fk_multicurrency integer, - multicurrency_code varchar(255), + multicurrency_code varchar(3), import_key varchar(14) -- import key )ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_supplier_proposal.sql b/htdocs/install/mysql/tables/llx_supplier_proposal.sql index cf64d76d7d1..0008f08642f 100644 --- a/htdocs/install/mysql/tables/llx_supplier_proposal.sql +++ b/htdocs/install/mysql/tables/llx_supplier_proposal.sql @@ -56,7 +56,7 @@ CREATE TABLE llx_supplier_proposal ( extraparams varchar(255) DEFAULT NULL, fk_multicurrency integer, - multicurrency_code varchar(255), + multicurrency_code varchar(3), multicurrency_tx double(24,8) DEFAULT 1, multicurrency_total_ht double(24,8) DEFAULT 0, multicurrency_total_tva double(24,8) DEFAULT 0, diff --git a/htdocs/install/mysql/tables/llx_supplier_proposaldet.sql b/htdocs/install/mysql/tables/llx_supplier_proposaldet.sql index 4e3d8bd13f9..bbf3decd7fa 100644 --- a/htdocs/install/mysql/tables/llx_supplier_proposaldet.sql +++ b/htdocs/install/mysql/tables/llx_supplier_proposaldet.sql @@ -49,7 +49,7 @@ CREATE TABLE llx_supplier_proposaldet ( rang integer DEFAULT 0, ref_fourn varchar(30) DEFAULT NULL, fk_multicurrency integer, - multicurrency_code varchar(255), + multicurrency_code varchar(3), multicurrency_subprice double(24,8) DEFAULT 0, multicurrency_total_ht double(24,8) DEFAULT 0, multicurrency_total_tva double(24,8) DEFAULT 0,