Laurent Destailleur a79aa1f203 Merge branch 'develop' of github.com:FHenry/dolibarr into FHenry-develop ...

Conflicts:
	htdocs/product/class/product.class.php

2014-06-26 21:38:03 +02:00

..

html.formproduct.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

product.class.php

Merge branch 'develop' of github.com:FHenry/dolibarr into FHenry-develop

2014-06-26 21:38:03 +02:00

productbatch.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

productcustomerprice.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

service.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00