Commit Graph

3 Commits

Author SHA1 Message Date
Laurent Destailleur
a55af4387b Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	.travis.yml
	htdocs/core/class/notify.class.php
	htdocs/product/stock/class/mouvementstock.class.php
	test/phpunit/AllTests.php
	test/phpunit/MouvementStockTest.php
2015-03-22 12:10:39 +01:00
Laurent Destailleur
c9b569ad1a Fix calculation of PMP of product.
Also add phpunit test to avoid this in future.
2015-03-21 15:31:11 +01:00
Laurent Destailleur
4f9aef6150 Fix calculation of PMP of product.
Also add phpunit test to avoid this in future.
2015-03-21 15:29:23 +01:00