Merge branch 'develop'

backend/controllers/DistributionController.php

@@ -257,7 +257,8 @@ class DistributionController extends BackendController
         return [
             'credit' => $producer->credit,
             'tiller' => $producer->tiller,
-            'option_distribution_export_orders_grid_pdf' => $producer->option_distribution_export_orders_grid_pdf
+            'option_distribution_export_orders_grid_pdf' => $producer->option_distribution_export_orders_grid_pdf,
+            'feature_product_accessory_enabled' => $this->getFeatureModule()->getChecker()->isEnabled(Feature::ALIAS_PRODUCT_ACCESSORY)
         ];
     }
 

backend/views/distribution/index.php

@@ -161,7 +161,7 @@ $this->setPageTitle('Distributions') ;
                                                 <input type="text" class="form-control quantity-max" placeholder="&infin;" :data-id-product="product.id" v-model="getProductDistribution(product).quantity_max" @keyup="productQuantityMaxChange"  />
                                                 <span class="input-group-addon">{{ labelUnitReference(product.unit) }}</span>
                                             </div>
-                                            <div class="limit-quantity-accessories" v-if="!showLoading && product.quantity_max && (getProductDistribution(product).quantity_max > product.quantity_max || !getProductDistribution(product).quantity_max)">
+                                            <div class="limit-quantity-accessories" v-if="producer.feature_product_accessory_enabled && !showLoading && product.quantity_max && (getProductDistribution(product).quantity_max > product.quantity_max || !getProductDistribution(product).quantity_max)">
                                                 <span class="glyphicon glyphicon-warning-sign"></span> Limitation accessoires :
                                                 <strong>{{ product.quantity_max }} {{ labelUnitReference(product.unit) }}</strong>
                                             </div>