diff --git a/ChangeLog b/ChangeLog index 47440d82590..4a93f86f55d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ For users: - New: Can modify proposal date if status is draft. - New: The help link on some pages now links directly to the wiki web page. - New: Enhancements in barcode module. +- New: Can use decimal values in stocks. - Fix: Partial payment on social contributions not shown on main page. - Fix: Handle correctly the comment in status changing of supplier orders. - Fix: Author, title and topic are correctly encoded in PDF. diff --git a/mysql/migration/2.5.0-2.6.0.sql b/mysql/migration/2.5.0-2.6.0.sql index f7b6b6ba244..243e41dcdba 100644 --- a/mysql/migration/2.5.0-2.6.0.sql +++ b/mysql/migration/2.5.0-2.6.0.sql @@ -38,6 +38,8 @@ insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) v alter table llx_product_stock add column pmp double(24,8) default 0 NOT NULL; alter table llx_product add column pmp double(24,8) default 0 NOT NULL; +alter table llx_product_stock modify column reel real; + ALTER TABLE llx_bank ADD INDEX idx_bank_datev(datev); ALTER TABLE llx_bank ADD INDEX idx_bank_dateo(dateo); ALTER TABLE llx_bank ADD INDEX idx_bank_fk_account(fk_account); diff --git a/mysql/tables/llx_product_det.sql b/mysql/tables/llx_product_det.sql index 7ba124e51ed..c806bf53582 100644 --- a/mysql/tables/llx_product_det.sql +++ b/mysql/tables/llx_product_det.sql @@ -1,5 +1,6 @@ -- ============================================================================ -- Copyright (C) 2002-2003 Rodolphe Quiedeville +-- Copyright (C) 2009 Laurent Destailleur -- -- 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 diff --git a/mysql/tables/llx_product_fournisseur.sql b/mysql/tables/llx_product_fournisseur.sql index cc8b5d066da..2cdbeefe174 100644 --- a/mysql/tables/llx_product_fournisseur.sql +++ b/mysql/tables/llx_product_fournisseur.sql @@ -1,5 +1,6 @@ -- ============================================================================ -- Copyright (C) 2003 Rodolphe Quiedeville +-- Copyright (C) 2009 Laurent Destailleur -- -- 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 diff --git a/mysql/tables/llx_product_fournisseur_price.sql b/mysql/tables/llx_product_fournisseur_price.sql index 84cb5dff520..d277277baf9 100644 --- a/mysql/tables/llx_product_fournisseur_price.sql +++ b/mysql/tables/llx_product_fournisseur_price.sql @@ -1,5 +1,6 @@ -- ============================================================================ -- Copyright (C) 2003 Rodolphe Quiedeville +-- Copyright (C) 2009 Laurent Destailleur -- -- 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 diff --git a/mysql/tables/llx_product_fournisseur_price_log.sql b/mysql/tables/llx_product_fournisseur_price_log.sql index d003166bd8d..b3078f87924 100644 --- a/mysql/tables/llx_product_fournisseur_price_log.sql +++ b/mysql/tables/llx_product_fournisseur_price_log.sql @@ -1,5 +1,6 @@ -- ============================================================================ -- Copyright (C) 2005 Rodolphe Quiedeville +-- Copyright (C) 2009 Laurent Destailleur -- -- 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 diff --git a/mysql/tables/llx_product_stock.sql b/mysql/tables/llx_product_stock.sql index e2075e1e192..43f48d65ff1 100644 --- a/mysql/tables/llx_product_stock.sql +++ b/mysql/tables/llx_product_stock.sql @@ -1,5 +1,6 @@ -- ============================================================================ -- Copyright (C) 2003 Rodolphe Quiedeville +-- Copyright (C) 2009 Laurent Destailleur -- -- 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 @@ -24,7 +25,7 @@ create table llx_product_stock tms timestamp, fk_product integer NOT NULL, fk_entrepot integer NOT NULL, - reel integer, -- physical stock - pmp double(24,8) default 0 NOT NULL -- PMP value for product in this warehous + reel real, -- physical stock + pmp double(24,8) default 0 NOT NULL -- PMP value for product in this warehous )type=innodb;