Merge branch 'develop'

Model/Product/ProductFamilyModel.php

@@ -49,11 +49,17 @@ abstract class ProductFamilyModel extends AbstractFullEntity implements ProductP
     const QUALITY_LABEL_RECUP = 'recup';
 
     static $organicLabels = [
-            self::QUALITY_LABEL_AB,
-            self::QUALITY_LABEL_NP,
-            self::QUALITY_LABEL_HVE,
-            self::QUALITY_LABEL_TVVR
+        self::QUALITY_LABEL_AB,
+        self::QUALITY_LABEL_NP,
+        self::QUALITY_LABEL_HVE,
+        self::QUALITY_LABEL_TVVR
     ];
+
+    static $organicStrictLabels = [
+        self::QUALITY_LABEL_AB,
+        self::QUALITY_LABEL_NP
+    ];
+
     static $geographicLabels = [
             self::QUALITY_LABEL_AOC,
             self::QUALITY_LABEL_AOP,

Repository/Product/ProductFamilyRepositoryQuery.php

@@ -140,7 +140,7 @@ class ProductFamilyRepositoryQuery extends AbstractRepositoryQuery
     {
         return $this->innerJoin('.qualityLabels', 'qualityLabel')
                 ->andWhere('qualityLabel.devAlias IN (:organicLabels)')
-                ->setParameter(':organicLabels', ProductFamilyModel::$organicLabels);
+                ->setParameter(':organicLabels', ProductFamilyModel::$organicStrictLabels);
     }
 
     public function filterIsNovelty()