Laurent Destailleur 546da0ceda Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/core/modules/modStock.class.php
	htdocs/product/inventory/list.php

2018-05-05 14:40:39 +02:00

..

index.html

…

ProductAttribute.class.php

Debug module variant

2017-11-26 18:43:43 +01:00

ProductAttributeValue.class.php

Missing user

2018-03-10 12:37:44 +01:00

ProductCombination2ValuePair.class.php

…

ProductCombination.class.php

Fix delete all product variants of a parent product

2018-05-02 22:33:23 +02:00