dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] BO : fixed bug #PSCFV-4471

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17603 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vAugagneur
2012-09-28 08:35:07 +00:00
parent b1cf1031cc
commit 72d32a7242
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminProductsController.php
+1 -1
View File
@@ -3383,7 +3383,7 @@ class AdminProductsControllerCore extends AdminController
protected function getCarrierList() 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)) if ($product = $this->loadObject(true))
{ {
$carrier_selected_list = $product->getCarriers(); $carrier_selected_list = $product->getCarriers();
controllers/admin/AdminWarehousesController.php
+1 -1
View File
@@ -251,7 +251,7 @@ class AdminWarehousesControllerCore extends AdminController
'required' => false, 'required' => false,
'multiple' => true, 'multiple' => true,
'options' => array( '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', 'id' => 'id_reference',
'name' => 'name' 'name' => 'name'
), ),