Laurent Destailleur de4ead2558 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ...

Conflicts:
	htdocs/accountancy/class/accountancycategory.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/product/reassort.php

2018-10-19 14:16:53 +02:00

..

api_products.class.php

Update api_products.class.php

2018-04-23 15:31:55 +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 '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0

2018-10-19 14:16:53 +02:00

productbatch.class.php

Fix the eatby/sellby date was not visible.

2017-12-02 10:43:01 +01:00

productcustomerprice.class.php

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-09-26 10:30:47 +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