diff --git a/ChangeLog b/ChangeLog index 2c909e832ee686f2acb0eae59c053b98e62d2c14..1f90f9c9b01115a62071cd36a8457faa37658e65 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,6 +38,7 @@ For developers: - Removed som deprecated files. - Renamed all function dolibarr_xxx into dol_xxx to have same prefix everywhere. - Rewrite clone feature for supplier invoice to work like other clone features. +- First change to manage a future feature "stock PMP value". ***** Changelog for 2.5 compared to 2.4 ***** diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example index 7fad067e177ac0dea54cd181b1fb1e6d4716c004..8a51766f73307bb13d96437bb79edfb4601bf4af 100644 --- a/htdocs/conf/conf.php.example +++ b/htdocs/conf/conf.php.example @@ -153,7 +153,7 @@ $dolibarr_main_authentication="dolibarr"; # Examples: # $dolibarr_main_authentication=0; # -$dolibarr_main_force_https=0 +$dolibarr_main_force_https="0" # Parameters used to setup LDAP authentication. diff --git a/mysql/tables/llx_product_stock.sql b/mysql/tables/llx_product_stock.sql index 893390535f6eccb393a762dc95382c793530bb10..e2075e1e192a001592d5585f6954a8685f031da4 100644 --- a/mysql/tables/llx_product_stock.sql +++ b/mysql/tables/llx_product_stock.sql @@ -24,7 +24,7 @@ create table llx_product_stock tms timestamp, fk_product integer NOT NULL, fk_entrepot integer NOT NULL, - reel integer -- physical stock + reel integer, -- physical stock pmp double(24,8) default 0 NOT NULL -- PMP value for product in this warehous )type=innodb;