Laurent Destailleur 782ab6a02b Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 ...

Conflicts:
	htdocs/core/modules/barcode/modules_barcode.class.php
	htdocs/product/admin/product.php

2016-08-05 00:42:40 +02:00

..

dynamic_prices.php

Revert "Corrected non-static usages of Form::selectarray function"

2016-03-25 15:34:37 +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

Fixes a little problem with multiprice rules, now undefined ones evaluate to 0% variation

2016-03-08 12:16:32 +01:00

product_extrafields.php

[Qual] comments should be in english

2015-12-22 09:37:27 +01:00

product_tools.php

Work on website module

2016-04-23 21:34:10 +02:00

product.php

Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0

2016-08-05 00:42:40 +02:00