Merge branch 'develop' of https://gitea.laclic.fr/Placedulocal/Symfony into develop

# Conflicts:
#	Lc

ShopBundle/Services/Order/OrderUtilsStockTrait.php

@@ -66,7 +66,13 @@ trait OrderUtilsStockTrait
 
                 $allCategoriesSalesOff = true;
                 foreach ($product->getProductFamily()->getProductCategories() as $category){
-                        if($category->getSaleStatus())$allCategoriesSalesOff = false;
+                        if($category->getParent()) {
+                                if($category->getSaleStatus() && $category->getParent()->getSaleStatus())
+                                        $allCategoriesSalesOff = false;
+                        }
+                        else {
+                                if($category->getSaleStatus()) $allCategoriesSalesOff = false;
+                        }
                 }
                 if($allCategoriesSalesOff) return false;