Laurent Destailleur 9ff1809f85 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/contrat/list.php htdocs/expedition/class/expedition.class.php htdocs/fourn/card.php htdocs/product/stock/class/productlot.class.php htdocs/theme/eldy/style.css.php		2016-09-12 02:05:38 +02:00
..
api_deprecated_product.class.php	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-08-02 17:43:12 +02:00
api_products.class.php	REST API: fix deleting a product/service.	2016-06-21 23:08:22 +02:00
html.formproduct.class.php	NEW prepare for additional warehouse statuses	2016-04-27 16:51:51 +02: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 '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-09-12 02:05:38 +02:00
productbatch.class.php	NEW Add option "Stock can be negative". Off by default.	2016-07-15 19:57:35 +02:00
productcustomerprice.class.php	Merge remote-tracking branch 'origin/3.9' into develop	2016-02-19 04:46:11 +01:00
propalmergepdfproduct.class.php	[Qual] Cleanup of inherited class properties	2015-09-24 20:12:55 +02:00
service.class.php	[Qual] Cleanup of inherited class properties	2015-09-24 20:12:55 +02:00