dolibarr/htdocs/product/admin
Laurent Destailleur 3a58613e45 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/accountancy/bookkeeping/listbyyear.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/compta/facture/list.php
	htdocs/filefunc.inc.php
	htdocs/fourn/facture/list.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/projet/activity/index.php
2016-03-02 23:40:11 +01:00
..
dynamic_prices.php Better Add buttons in dynamicprice module 2016-02-14 16:35:17 +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
price_rules.php [Qual] Uniformize code 2015-12-12 10:59:02 +01:00
product_extrafields.php [Qual] comments should be in english 2015-12-22 09:37:27 +01:00
product_tools.php [Qual] Uniformize code 2015-12-12 10:59:02 +01:00
product.php Merge remote-tracking branch 'origin/3.9' into develop 2016-03-02 23:40:11 +01:00