Laurent Destailleur 5a1a5548df Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/core/actions_massactions.inc.php htdocs/core/class/discount.class.php htdocs/core/lib/payments.lib.php htdocs/product/index.php htdocs/product/list.php htdocs/societe/class/societe.class.php		2018-10-19 14:27:15 +02:00
..
api_products.class.php	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-29 20:11:47 +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
product.class.php	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-10-19 14:27:15 +02:00
productbatch.class.php	Fix the eatby/sellby date was not visible.	2017-12-02 10:43:01 +01:00
productcustomerprice.class.php	Update productcustomerprice.class.php	2018-07-09 17:04:50 +02:00
propalmergepdfproduct.class.php