diff --git a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql index cffa2ccfe0b..aa287e5f610 100644 --- a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql +++ b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql @@ -458,3 +458,83 @@ UPDATE llx_accounting_system SET fk_country =140 WHERE pcg_version = 'PCN-LUXEMB -- May have error due to duplicate keys ALTER TABLE llx_resource ADD UNIQUE INDEX uk_resource_ref (ref, entity); + +-- SPEC : use database type "numeric" to store monetary values +ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN debit numeric(24,8); +ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN credit numeric(24,8); +ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN montant numeric(24,8); +ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN multicurrency_amount numeric(24,8); +ALTER TABLE llx_accounting_bookkeeping_tmp MODIFY COLUMN debit numeric(24,8); +ALTER TABLE llx_accounting_bookkeeping_tmp MODIFY COLUMN credit numeric(24,8); +ALTER TABLE llx_accounting_bookkeeping_tmp MODIFY COLUMN montant numeric(24,8); +ALTER TABLE llx_accounting_bookkeeping_tmp MODIFY COLUMN multicurrency_amount numeric(24,8); +ALTER TABLE llx_bank MODIFY COLUMN amount numeric(24,8); +ALTER TABLE llx_bordereau_cheque MODIFY COLUMN amount numeric(24,8); +ALTER TABLE llx_blockedlog MODIFY COLUMN amounts numeric(24,8); +ALTER TABLE llx_budget_lines MODIFY COLUMN amount numeric(24,8); +ALTER TABLE llx_chargessociales MODIFY COLUMN amount numeric(24,8); +ALTER TABLE llx_commande MODIFY COLUMN amount_ht numeric(24,8); +ALTER TABLE llx_commande MODIFY COLUMN tva numeric(24,8); +ALTER TABLE llx_commande MODIFY COLUMN localtax1 numeric(24,8); +ALTER TABLE llx_commande MODIFY COLUMN localtax2 numeric(24,8); +ALTER TABLE llx_commande MODIFY COLUMN total_ht numeric(24,8); +ALTER TABLE llx_commande MODIFY COLUMN total_ttc numeric(24,8); +ALTER TABLE llx_commande MODIFY COLUMN multicurrency_tx numeric(24,8); +ALTER TABLE llx_commande MODIFY COLUMN multicurrency_total_ht numeric(24,8); +ALTER TABLE llx_commande MODIFY COLUMN multicurrency_total_tva numeric(24,8); +ALTER TABLE llx_commande MODIFY COLUMN multicurrency_total_ttc numeric(24,8); +ALTER TABLE llx_commandedet MODIFY COLUMN subprice numeric(24,8); +ALTER TABLE llx_commandedet MODIFY COLUMN total_ht numeric(24,8); +ALTER TABLE llx_commandedet MODIFY COLUMN total_tva numeric(24,8); +ALTER TABLE llx_commandedet MODIFY COLUMN total_localtax1 numeric(24,8); +ALTER TABLE llx_commandedet MODIFY COLUMN total_localtax2 numeric(24,8); +ALTER TABLE llx_commandedet MODIFY COLUMN total_ttc numeric(24,8); +ALTER TABLE llx_commandedet MODIFY COLUMN buy_price_ht numeric(24,8); +ALTER TABLE llx_commandedet MODIFY COLUMN multicurrency_subprice numeric(24,8); +ALTER TABLE llx_commandedet MODIFY COLUMN multicurrency_total_ht numeric(24,8); +ALTER TABLE llx_commandedet MODIFY COLUMN multicurrency_total_tva numeric(24,8); +ALTER TABLE llx_commandedet MODIFY COLUMN multicurrency_total_ttc numeric(24,8); +ALTER TABLE llx_commande_fournisseur MODIFY COLUMN tva numeric(24,8); +ALTER TABLE llx_commande_fournisseur MODIFY COLUMN localtax1 numeric(24,8); +ALTER TABLE llx_commande_fournisseur MODIFY COLUMN localtax2 numeric(24,8); +ALTER TABLE llx_commande_fournisseur MODIFY COLUMN amount_ht numeric(24,8); +ALTER TABLE llx_commande_fournisseur MODIFY COLUMN total_ht numeric(24,8); +ALTER TABLE llx_commande_fournisseur MODIFY COLUMN total_ttc numeric(24,8); +ALTER TABLE llx_commande_fournisseur MODIFY COLUMN multicurrency_total_ht numeric(24,8); +ALTER TABLE llx_commande_fournisseur MODIFY COLUMN multicurrency_total_tva numeric(24,8); +ALTER TABLE llx_commande_fournisseur MODIFY COLUMN multicurrency_total_ttc numeric(24,8); +ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN localtax1_tx numeric(24,8); +ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN localtax2_tx numeric(24,8); +ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN subprice numeric(24,8); +ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN total_ht numeric(24,8); +ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN total_tva numeric(24,8); +ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN total_localtax1 numeric(24,8); +ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN total_localtax2 numeric(24,8); +ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN total_ttc numeric(24,8); +ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN multicurrency_subprice numeric(24,8); +ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN multicurrency_total_ht numeric(24,8); +ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN multicurrency_total_tva numeric(24,8); +ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN multicurrency_total_ttc numeric(24,8); +ALTER TABLE llx_c_ecotaxe MODIFY COLUMN price numeric(24,8); +ALTER TABLE llx_don MODIFY COLUMN amount numeric(24,8); +ALTER TABLE llx_loan MODIFY COLUMN capital numeric(24,8); +ALTER TABLE llx_loan MODIFY COLUMN capital_position numeric(24,8); +ALTER TABLE llx_loan_schedule MODIFY COLUMN amount_capital numeric(24,8); +ALTER TABLE llx_loan_schedule MODIFY COLUMN amount_insurance numeric(24,8); +ALTER TABLE llx_loan_schedule MODIFY COLUMN amount_interest numeric(24,8); +ALTER TABLE llx_paiementcharge MODIFY COLUMN amount numeric(24,8); +ALTER TABLE llx_paiementfourn MODIFY COLUMN amount numeric(24,8); +ALTER TABLE llx_paiementfourn MODIFY COLUMN multicurrency_amount numeric(24,8); +ALTER TABLE llx_payment_donation MODIFY COLUMN amount numeric(24,8); +ALTER TABLE llx_payment_expensereport MODIFY COLUMN amount numeric(24,8); +ALTER TABLE llx_payment_loan MODIFY COLUMN amount_capital numeric(24,8); +ALTER TABLE llx_payment_loan MODIFY COLUMN amount_insurance numeric(24,8); +ALTER TABLE llx_payment_loan MODIFY COLUMN amount_interest numeric(24,8); +ALTER TABLE llx_payment_salary MODIFY COLUMN salary numeric(24,8); +ALTER TABLE llx_payment_salary MODIFY COLUMN amount numeric(24,8); +ALTER TABLE llx_prelevement_bons MODIFY COLUMN amount numeric(24,8); +ALTER TABLE llx_prelevement_facture_demande MODIFY COLUMN amount numeric(24,8); +ALTER TABLE llx_prelevement_lignes MODIFY COLUMN amount numeric(24,8); +ALTER TABLE llx_societe MODIFY COLUMN capital numeric(24,8); +ALTER TABLE llx_tva MODIFY COLUMN amount numeric(24,8); +ALTER TABLE llx_subscription MODIFY COLUMN subscription numeric(24,8); diff --git a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql index 4d9f6320566..628f14fb5b0 100644 --- a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql +++ b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql @@ -32,11 +32,11 @@ CREATE TABLE llx_accounting_bookkeeping numero_compte varchar(32) NOT NULL, -- FEC:CompteNum | account number label_compte varchar(255) NOT NULL, -- FEC:CompteLib | label of account label_operation varchar(255), -- FEC:EcritureLib | label of the operation - debit double(24,8) NOT NULL, -- FEC:Debit - credit double(24,8) NOT NULL, -- FEC:Credit - montant double(24,8) NOT NULL, -- FEC:Montant (Not necessary) + debit numeric(24,8) NOT NULL, -- FEC:Debit + credit numeric(24,8) NOT NULL, -- FEC:Credit + montant numeric(24,8) NOT NULL, -- FEC:Montant (Not necessary) sens varchar(1) DEFAULT NULL, -- FEC:Sens (Not necessary) - multicurrency_amount double(24,8), -- FEC:Montantdevise + multicurrency_amount numeric(24,8), -- FEC:Montantdevise multicurrency_code varchar(255), -- FEC:Idevise lettering_code varchar(255), -- FEC:EcritureLet date_lettering datetime, -- FEC:DateLet diff --git a/htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.sql b/htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.sql index e49c937d6ed..8688b97fe9d 100644 --- a/htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.sql +++ b/htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.sql @@ -32,11 +32,11 @@ CREATE TABLE llx_accounting_bookkeeping_tmp numero_compte varchar(32), -- FEC:CompteNum | account number label_compte varchar(255) NOT NULL, -- FEC:CompteLib | label of account label_operation varchar(255), -- FEC:EcritureLib | label of the operation - debit double(24,8) NOT NULL, -- FEC:Debit - credit double(24,8) NOT NULL, -- FEC:Credit - montant double(24,8) NOT NULL, -- FEC:Montant (Not necessary) + debit numeric(24,8) NOT NULL, -- FEC:Debit + credit numeric(24,8) NOT NULL, -- FEC:Credit + montant numeric(24,8) NOT NULL, -- FEC:Montant (Not necessary) sens varchar(1) DEFAULT NULL, -- FEC:Sens (Not necessary) - multicurrency_amount double(24,8), -- FEC:Montantdevise + multicurrency_amount numeric(24,8), -- FEC:Montantdevise multicurrency_code varchar(255), -- FEC:Idevise lettering_code varchar(255), -- FEC:EcritureLet date_lettering datetime, -- FEC:DateLet diff --git a/htdocs/install/mysql/tables/llx_bank.sql b/htdocs/install/mysql/tables/llx_bank.sql index 6c2c8d34537..9eee185f1da 100644 --- a/htdocs/install/mysql/tables/llx_bank.sql +++ b/htdocs/install/mysql/tables/llx_bank.sql @@ -24,7 +24,7 @@ create table llx_bank tms timestamp, datev date, -- date de valeur dateo date, -- date operation - amount double(24,8) NOT NULL default 0, + amount numeric(24,8) NOT NULL default 0, label varchar(255), fk_account integer, fk_user_author integer, diff --git a/htdocs/install/mysql/tables/llx_blockedlog.sql b/htdocs/install/mysql/tables/llx_blockedlog.sql index 2e2710c300c..596dba9e69d 100644 --- a/htdocs/install/mysql/tables/llx_blockedlog.sql +++ b/htdocs/install/mysql/tables/llx_blockedlog.sql @@ -21,7 +21,7 @@ CREATE TABLE llx_blockedlog rowid integer AUTO_INCREMENT PRIMARY KEY, tms timestamp, action varchar(50), - amounts real NOT NULL, + amounts numeric(24,8) NOT NULL, signature varchar(100) NOT NULL, signature_line varchar(100) NOT NULL, element varchar(50), diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql index 7950d205bc8..4afaee64aaf 100644 --- a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql +++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql @@ -25,10 +25,10 @@ create table llx_bordereau_cheque ( rowid integer AUTO_INCREMENT PRIMARY KEY, ref varchar(30) NOT NULL, -- ref - ref_ext varchar(255), -- ref_ext + ref_ext varchar(255), -- ref_ext datec datetime NOT NULL, date_bordereau date, - amount double(24,8) NOT NULL, + amount numeric(24,8) NOT NULL, nbcheque smallint NOT NULL, fk_bank_account integer, fk_user_author integer, diff --git a/htdocs/install/mysql/tables/llx_budget_lines.sql b/htdocs/install/mysql/tables/llx_budget_lines.sql index c93a6e736e7..74c228ed98c 100644 --- a/htdocs/install/mysql/tables/llx_budget_lines.sql +++ b/htdocs/install/mysql/tables/llx_budget_lines.sql @@ -21,7 +21,7 @@ create table llx_budget_lines rowid integer AUTO_INCREMENT PRIMARY KEY, fk_budget integer NOT NULL, fk_project_ids varchar(255) NOT NULL, -- 'IDS:x,y' = List of project ids related to this budget. If budget is dedicated to projects not yet started, we recommand to create a project 'Projects to come'. 'FILTER:ref=*ABC' = Can also be a dynamic rule to select projects. - amount double(24,8) NOT NULL, + amount numeric(24,8) NOT NULL, datec datetime, tms timestamp, fk_user_creat integer, diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql index 09613787f76..bee5ab61026 100644 --- a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql +++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql @@ -22,7 +22,7 @@ create table llx_c_ecotaxe rowid integer AUTO_INCREMENT PRIMARY KEY, code varchar(64) NOT NULL, -- Code servant a la traduction et a la reference interne libelle varchar(255), -- Description - price double(24,8), -- Montant HT + price numeric(24,8), -- Montant HT organization varchar(255), -- Organisme gerant le bareme tarifaire fk_pays integer NOT NULL, -- Pays correspondant active tinyint DEFAULT 1 NOT NULL diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql index f52d155ecaa..a5b074b83cf 100644 --- a/htdocs/install/mysql/tables/llx_chargesociales.sql +++ b/htdocs/install/mysql/tables/llx_chargesociales.sql @@ -34,7 +34,7 @@ create table llx_chargesociales fk_type integer NOT NULL, fk_account integer, -- bank account fk_mode_reglement integer, -- mode de reglement - amount real default 0 NOT NULL, + amount numeric(24,8) default 0 NOT NULL, paye smallint default 0 NOT NULL, periode date, fk_projet integer DEFAULT NULL, diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql index b6708de3783..add3f2d53e2 100644 --- a/htdocs/install/mysql/tables/llx_commande.sql +++ b/htdocs/install/mysql/tables/llx_commande.sql @@ -42,15 +42,15 @@ create table llx_commande fk_user_cloture integer, -- user closing source smallint, -- not used, except by setting this to 42 for orders coming for replenishment and 0 in other case ? fk_statut smallint default 0, - amount_ht real default 0, + amount_ht numeric(24,8) default 0, remise_percent real default 0, remise_absolue real default 0, remise real default 0, - tva double(24,8) default 0, - localtax1 double(24,8) default 0, -- total localtax1 - localtax2 double(24,8) default 0, -- total localtax2 - total_ht double(24,8) default 0, - total_ttc double(24,8) default 0, + tva numeric(24,8) default 0, + localtax1 numeric(24,8) default 0, -- total localtax1 + localtax2 numeric(24,8) default 0, -- total localtax2 + total_ht numeric(24,8) default 0, + total_ttc numeric(24,8) default 0, note_private text, note_public text, model_pdf varchar(255), @@ -74,9 +74,9 @@ create table llx_commande extraparams varchar(255), -- for stock other parameters with json format fk_multicurrency integer, - multicurrency_code varchar(255), - multicurrency_tx double(24,8) DEFAULT 1, - multicurrency_total_ht double(24,8) DEFAULT 0, - multicurrency_total_tva double(24,8) DEFAULT 0, - multicurrency_total_ttc double(24,8) DEFAULT 0 + multicurrency_code varchar(255), + multicurrency_tx numeric(24,8) DEFAULT 1, + multicurrency_total_ht numeric(24,8) DEFAULT 0, + multicurrency_total_tva numeric(24,8) DEFAULT 0, + multicurrency_total_ttc numeric(24,8) DEFAULT 0 )ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql index 87124697a57..ec08b95b6fb 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql @@ -46,14 +46,14 @@ create table llx_commande_fournisseur source smallint NOT NULL, -- not used, except by setting this to 42 for orders coming for replenishment and 0 in other case ? fk_statut smallint default 0, billed smallint default 0, - amount_ht real default 0, + amount_ht numeric(24,8) default 0, remise_percent real default 0, remise real default 0, - tva double(24,8) default 0, - localtax1 double(24,8) default 0, - localtax2 double(24,8) default 0, - total_ht double(24,8) default 0, - total_ttc double(24,8) default 0, + tva numeric(24,8) default 0, + localtax1 numeric(24,8) default 0, + localtax2 numeric(24,8) default 0, + total_ht numeric(24,8) default 0, + total_ttc numeric(24,8) default 0, note_private text, note_public text, model_pdf varchar(255), @@ -70,9 +70,9 @@ 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(255), multicurrency_tx double(24,8) DEFAULT 1, - multicurrency_total_ht double(24,8) DEFAULT 0, - multicurrency_total_tva double(24,8) DEFAULT 0, - multicurrency_total_ttc double(24,8) DEFAULT 0 + multicurrency_total_ht numeric(24,8) DEFAULT 0, + multicurrency_total_tva numeric(24,8) DEFAULT 0, + multicurrency_total_ttc numeric(24,8) DEFAULT 0 )ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql index 85cdcbb9a60..17d86d2b016 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql @@ -30,19 +30,19 @@ create table llx_commande_fournisseurdet description text, vat_src_code varchar(10) DEFAULT '', -- Vat code used as source of vat fields. Not strict foreign key here. tva_tx double(6,3) DEFAULT 0, -- taux tva - localtax1_tx double(6,3) DEFAULT 0, -- localtax1 rate + localtax1_tx numeric(24,8) DEFAULT 0, -- localtax1 rate localtax1_type varchar(10) NULL, -- localtax1 type - localtax2_tx double(6,3) DEFAULT 0, -- localtax2 rate + localtax2_tx numeric(24,8) DEFAULT 0, -- localtax2 rate localtax2_type varchar(10) NULL, -- localtax2 type qty real, -- quantity remise_percent real DEFAULT 0, -- pourcentage de remise remise real DEFAULT 0, -- montant de la remise - subprice double(24,8) DEFAULT 0, -- prix unitaire - 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 Local Tax 1 - total_localtax2 double(24,8) DEFAULT 0, -- Total Local Tax 2 - total_ttc double(24,8) DEFAULT 0, -- Total TTC de la ligne toute quantite et incluant remise ligne et globale + subprice numeric(24,8) DEFAULT 0, -- prix unitaire + total_ht numeric(24,8) DEFAULT 0, -- Total HT de la ligne toute quantite et incluant remise ligne et globale + total_tva numeric(24,8) DEFAULT 0, -- Total TVA de la ligne toute quantite et incluant remise ligne et globale + total_localtax1 numeric(24,8) DEFAULT 0, -- Total Local Tax 1 + total_localtax2 numeric(24,8) DEFAULT 0, -- Total Local Tax 2 + total_ttc numeric(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 date_end datetime DEFAULT NULL, -- date fin si service @@ -52,10 +52,10 @@ create table llx_commande_fournisseurdet import_key varchar(14), fk_unit integer DEFAULT NULL, - fk_multicurrency integer, - multicurrency_code varchar(255), - multicurrency_subprice double(24,8) DEFAULT 0, - multicurrency_total_ht double(24,8) DEFAULT 0, - multicurrency_total_tva double(24,8) DEFAULT 0, - multicurrency_total_ttc double(24,8) DEFAULT 0 + fk_multicurrency integer, + multicurrency_code varchar(255), + multicurrency_subprice numeric(24,8) DEFAULT 0, + multicurrency_total_ht numeric(24,8) DEFAULT 0, + multicurrency_total_tva numeric(24,8) DEFAULT 0, + multicurrency_total_ttc numeric(24,8) DEFAULT 0 )ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_commandedet.sql b/htdocs/install/mysql/tables/llx_commandedet.sql index 53a1b07c3c7..ae252870fd3 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.sql @@ -39,18 +39,18 @@ create table llx_commandedet remise real DEFAULT 0, -- montant de la remise fk_remise_except integer NULL, -- Lien vers table des remises fixes price real, -- prix final - subprice double(24,8) DEFAULT 0, -- P.U. HT (exemple 100) - 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 + subprice numeric(24,8) DEFAULT 0, -- P.U. HT (exemple 100) + total_ht numeric(24,8) DEFAULT 0, -- Total HT de la ligne toute quantite et incluant remise ligne et globale + total_tva numeric(24,8) DEFAULT 0, -- Total TVA de la ligne toute quantite et incluant remise ligne et globale + total_localtax1 numeric(24,8) DEFAULT 0, -- Total LocalTax1 + total_localtax2 numeric(24,8) DEFAULT 0, -- Total LocalTax2 + total_ttc numeric(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 date_end datetime DEFAULT NULL, -- date fin si service info_bits integer DEFAULT 0, -- TVA NPR ou non - buy_price_ht double(24,8) DEFAULT 0, -- buying price + buy_price_ht numeric(24,8) DEFAULT 0, -- buying price fk_product_fournisseur_price integer DEFAULT NULL, -- reference of supplier price when line was added (may be used to update buy_price_ht current price when future invoice will be created) special_code integer DEFAULT 0, -- code pour les lignes speciales @@ -60,12 +60,12 @@ create table llx_commandedet fk_commandefourndet integer DEFAULT NULL, -- link to detail line of commande fourn (resplenish) - fk_multicurrency integer, + fk_multicurrency integer, multicurrency_code varchar(255), - multicurrency_subprice double(24,8) DEFAULT 0, - multicurrency_total_ht double(24,8) DEFAULT 0, - multicurrency_total_tva double(24,8) DEFAULT 0, - multicurrency_total_ttc double(24,8) DEFAULT 0 + multicurrency_subprice numeric(24,8) DEFAULT 0, + multicurrency_total_ht numeric(24,8) DEFAULT 0, + multicurrency_total_tva numeric(24,8) DEFAULT 0, + multicurrency_total_ttc numeric(24,8) DEFAULT 0 )ENGINE=innodb; -- diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql index e2fbdba9efb..efa6614796c 100644 --- a/htdocs/install/mysql/tables/llx_don.sql +++ b/htdocs/install/mysql/tables/llx_don.sql @@ -28,7 +28,7 @@ create table llx_don tms timestamp, fk_statut smallint NOT NULL DEFAULT 0, -- Status of donation promise or validate datedon datetime, -- Date of the donation/promise - amount real DEFAULT 0, + amount numeric(24,8) DEFAULT 0, fk_payment integer, paid smallint default 0 NOT NULL, firstname varchar(50), diff --git a/htdocs/install/mysql/tables/llx_loan.sql b/htdocs/install/mysql/tables/llx_loan.sql index f55b793e5ec..ae2d3bac96d 100644 --- a/htdocs/install/mysql/tables/llx_loan.sql +++ b/htdocs/install/mysql/tables/llx_loan.sql @@ -23,24 +23,24 @@ create table llx_loan entity integer DEFAULT 1 NOT NULL, datec datetime, tms timestamp, - + label varchar(80) NOT NULL, fk_bank integer, - - capital real default 0 NOT NULL, + + capital numeric(24,8) default 0 NOT NULL, datestart date, dateend date, nbterm real, rate double NOT NULL, - + note_private text, note_public text, - - capital_position real default 0, -- If not a new loan, just have the position of capital + + capital_position numeric(24,8) default 0, -- If not a new loan, just have the position of capital date_position date, - + paid smallint default 0 NOT NULL, - + accountancy_account_capital varchar(32), accountancy_account_insurance varchar(32), accountancy_account_interest varchar(32), diff --git a/htdocs/install/mysql/tables/llx_loan_schedule.sql b/htdocs/install/mysql/tables/llx_loan_schedule.sql index c682b22f276..eb43238255a 100644 --- a/htdocs/install/mysql/tables/llx_loan_schedule.sql +++ b/htdocs/install/mysql/tables/llx_loan_schedule.sql @@ -24,9 +24,9 @@ create table llx_loan_schedule datec datetime, -- creation date tms timestamp, datep datetime, -- payment date - amount_capital real DEFAULT 0, - amount_insurance real DEFAULT 0, - amount_interest real DEFAULT 0, + amount_capital numeric(24,8) DEFAULT 0, + amount_insurance numeric(24,8) DEFAULT 0, + amount_interest numeric(24,8) DEFAULT 0, fk_typepayment integer NOT NULL, num_payment varchar(50), note_private text, diff --git a/htdocs/install/mysql/tables/llx_paiementcharge.sql b/htdocs/install/mysql/tables/llx_paiementcharge.sql index 2efca933dba..086bafae0fa 100644 --- a/htdocs/install/mysql/tables/llx_paiementcharge.sql +++ b/htdocs/install/mysql/tables/llx_paiementcharge.sql @@ -23,7 +23,7 @@ create table llx_paiementcharge datec datetime, -- date de creation tms timestamp, datep datetime, -- payment date - amount real DEFAULT 0, + amount numeric(24,8) DEFAULT 0, fk_typepaiement integer NOT NULL, num_paiement varchar(50), note text, diff --git a/htdocs/install/mysql/tables/llx_paiementfourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn.sql index 0e9b1885c97..126d4df8c2a 100644 --- a/htdocs/install/mysql/tables/llx_paiementfourn.sql +++ b/htdocs/install/mysql/tables/llx_paiementfourn.sql @@ -25,8 +25,8 @@ create table llx_paiementfourn tms timestamp, datec datetime, -- date de creation de l'enregistrement datep datetime, -- date de paiement - amount real DEFAULT 0, -- montant - multicurrency_amount double(24,8) DEFAULT 0, -- multicurrency amount + amount numeric(24,8) DEFAULT 0, -- montant + multicurrency_amount numeric(24,8) DEFAULT 0, -- multicurrency amount fk_user_author integer, -- auteur fk_paiement integer NOT NULL, -- moyen de paiement num_paiement varchar(50), -- numero de paiement (cheque) diff --git a/htdocs/install/mysql/tables/llx_payment_donation.sql b/htdocs/install/mysql/tables/llx_payment_donation.sql index afa5075cd4e..1859c7aa796 100644 --- a/htdocs/install/mysql/tables/llx_payment_donation.sql +++ b/htdocs/install/mysql/tables/llx_payment_donation.sql @@ -23,7 +23,7 @@ create table llx_payment_donation datec datetime, -- date de creation tms timestamp, datep datetime, -- payment date - amount real DEFAULT 0, + amount numeric(24,8) DEFAULT 0, fk_typepayment integer NOT NULL, num_payment varchar(50), note text, diff --git a/htdocs/install/mysql/tables/llx_payment_expensereport.sql b/htdocs/install/mysql/tables/llx_payment_expensereport.sql index 40e39771978..1857246e22e 100644 --- a/htdocs/install/mysql/tables/llx_payment_expensereport.sql +++ b/htdocs/install/mysql/tables/llx_payment_expensereport.sql @@ -23,7 +23,7 @@ create table llx_payment_expensereport datec datetime, -- date de creation tms timestamp, datep datetime, -- payment date - amount real DEFAULT 0, + amount numeric(24,8) DEFAULT 0, fk_typepayment integer NOT NULL, num_payment varchar(50), note text, diff --git a/htdocs/install/mysql/tables/llx_payment_loan.sql b/htdocs/install/mysql/tables/llx_payment_loan.sql index d023c039391..3b6111a7b2f 100644 --- a/htdocs/install/mysql/tables/llx_payment_loan.sql +++ b/htdocs/install/mysql/tables/llx_payment_loan.sql @@ -24,9 +24,9 @@ create table llx_payment_loan datec datetime, -- creation date tms timestamp, datep datetime, -- payment date - amount_capital real DEFAULT 0, - amount_insurance real DEFAULT 0, - amount_interest real DEFAULT 0, + amount_capital numeric(24,8) DEFAULT 0, + amount_insurance numeric(24,8) DEFAULT 0, + amount_interest numeric(24,8) DEFAULT 0, fk_typepayment integer NOT NULL, num_payment varchar(50), note_private text, diff --git a/htdocs/install/mysql/tables/llx_payment_salary.sql b/htdocs/install/mysql/tables/llx_payment_salary.sql index 38364c6812e..d9b0f3f4477 100644 --- a/htdocs/install/mysql/tables/llx_payment_salary.sql +++ b/htdocs/install/mysql/tables/llx_payment_salary.sql @@ -24,8 +24,8 @@ create table llx_payment_salary fk_user integer NOT NULL, datep date, -- date de paiement datev date, -- date de valeur (this field should not be here, only into bank tables) - salary real, -- salary of user when payment was done - amount real NOT NULL DEFAULT 0, + salary numeric(24,8), -- salary of user when payment was done + amount numeric(24,8) NOT NULL DEFAULT 0, fk_typepayment integer NOT NULL, num_payment varchar(50), -- ref label varchar(255), diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.sql index e92342eb001..c9cdf7992a2 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.sql @@ -29,7 +29,7 @@ create table llx_prelevement_bons ref varchar(12), -- reference entity integer DEFAULT 1 NOT NULL, -- multi company id datec datetime, -- date de creation - amount real DEFAULT 0, -- montant total du prelevement + amount numeric(24,8) DEFAULT 0, -- montant total du prelevement statut smallint DEFAULT 0, -- statut credite smallint DEFAULT 0, -- indique si le prelevement a ete credite note text, diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql index 3bdc0e2ed81..1d1b59bf3f5 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql @@ -21,7 +21,7 @@ create table llx_prelevement_facture_demande ( rowid integer AUTO_INCREMENT PRIMARY KEY, fk_facture integer NOT NULL, - amount real NOT NULL, + amount numeric(24,8) NOT NULL, date_demande datetime NOT NULL, traite smallint DEFAULT 0, date_traite datetime, diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql index 04b6e1ebf5e..448b3846d71 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql @@ -24,7 +24,7 @@ create table llx_prelevement_lignes statut smallint DEFAULT 0, client_nom varchar(255), - amount real DEFAULT 0, + amount numeric(24,8) DEFAULT 0, code_banque varchar(128), code_guichet varchar(6), number varchar(255), diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql index 0f0cb437750..38097090a4c 100644 --- a/htdocs/install/mysql/tables/llx_societe.sql +++ b/htdocs/install/mysql/tables/llx_societe.sql @@ -64,7 +64,7 @@ create table llx_societe idprof5 varchar(128), -- IDProf5: nu for france idprof6 varchar(128), -- IDProf6: nu for france tva_intra varchar(20), -- tva - capital real, -- capital de la societe + capital numeric(24,8), -- capital de la societe fk_stcomm integer DEFAULT 0 NOT NULL, -- commercial statut note_private text, -- note_public text, -- diff --git a/htdocs/install/mysql/tables/llx_subscription.sql b/htdocs/install/mysql/tables/llx_subscription.sql index 3f54e487060..f1a22d6ec83 100644 --- a/htdocs/install/mysql/tables/llx_subscription.sql +++ b/htdocs/install/mysql/tables/llx_subscription.sql @@ -24,7 +24,7 @@ create table llx_subscription fk_adherent integer, dateadh datetime, datef date, - subscription real, + subscription numeric(24,8), fk_bank integer DEFAULT NULL, note text )ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_tva.sql b/htdocs/install/mysql/tables/llx_tva.sql index 9abf63d6ad9..c0f680c4824 100644 --- a/htdocs/install/mysql/tables/llx_tva.sql +++ b/htdocs/install/mysql/tables/llx_tva.sql @@ -24,7 +24,7 @@ create table llx_tva datec datetime, -- Create date datep date, -- date de paiement datev date, -- date de valeur - amount real NOT NULL DEFAULT 0, + amount numeric(24,8) NOT NULL DEFAULT 0, fk_typepayment integer NULL, num_payment varchar(50), label varchar(255),