Laurent Destailleur 26cff9e11f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ...

Conflicts:
	htdocs/langs/en_US/blockedlog.lang
	htdocs/stripe/config.php

2018-09-01 14:13:01 +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-09-01 14:13:01 +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

Add more robust php unit to detect not escaped sql. Fix not escaped sql

2017-09-15 15:41:07 +02:00