From 72d32a7242c0ee523d4abd6e544c83bc2e5dcae1 Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Fri, 28 Sep 2012 08:35:07 +0000 Subject: [PATCH] [-] BO : fixed bug #PSCFV-4471 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17603 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/admin/AdminProductsController.php | 2 +- controllers/admin/AdminWarehousesController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index a68054208..d8c62c4c2 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -3383,7 +3383,7 @@ class AdminProductsControllerCore extends AdminController protected function getCarrierList() { - $carrier_list = Carrier::getCarriers($this->context->language->id); + $carrier_list = Carrier::getCarriers($this->context->language->id, false, false, false, null, Carrier::ALL_CARRIERS); if ($product = $this->loadObject(true)) { $carrier_selected_list = $product->getCarriers(); diff --git a/controllers/admin/AdminWarehousesController.php b/controllers/admin/AdminWarehousesController.php index a5769b9ba..79f642151 100644 --- a/controllers/admin/AdminWarehousesController.php +++ b/controllers/admin/AdminWarehousesController.php @@ -251,7 +251,7 @@ class AdminWarehousesControllerCore extends AdminController 'required' => false, 'multiple' => true, 'options' => array( - 'query' => Carrier::getCarriers($this->context->language->id, true), + 'query' => Carrier::getCarriers($this->context->language->id, false, false, false, null, Carrier::ALL_CARRIERS), 'id' => 'id_reference', 'name' => 'name' ),