Laurent Destailleur f85e79e250 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.formfile.class.php htdocs/filefunc.inc.php htdocs/holiday/class/holiday.class.php		2017-12-08 13:13:53 +01:00
..
api_products.class.php	Set default limit to 100 on all rest api that list	2017-10-22 15:42:19 +02:00
html.formproduct.class.php	Standardize database: field ref of warehouse was renamed label -> ref	2017-11-24 15:27:00 +01:00
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
product.class.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-12-08 13:13:53 +01:00
productbatch.class.php	Fix the eatby/sellby date was not visible.	2017-12-02 10:43:01 +01:00
productcustomerprice.class.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-26 10:30:47 +02:00
propalmergepdfproduct.class.php	Add more robust php unit to detect not escaped sql. Fix not escaped sql	2017-09-15 15:41:07 +02:00