From 5b4d337cd6cb160324a91dc710385fb42e469417 Mon Sep 17 00:00:00 2001 From: bMancone Date: Tue, 22 Nov 2011 09:23:32 +0000 Subject: [PATCH] // Warehouse: shops are now correctly associated git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10387 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/admin/AdminWarehousesController.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/controllers/admin/AdminWarehousesController.php b/controllers/admin/AdminWarehousesController.php index 1441f6b60..07b8989a3 100644 --- a/controllers/admin/AdminWarehousesController.php +++ b/controllers/admin/AdminWarehousesController.php @@ -259,12 +259,14 @@ class AdminWarehousesControllerCore extends AdminController ); + // Shop Association if (Shop::isFeatureActive()) { $this->fields_form['input'][] = array( 'type' => 'shop', - 'label' => $this->l('Shop association:'), + 'label' => $this->l('Shops:'), 'name' => 'checkBoxShopAsso', + 'desc' => 'Associated shops', 'values' => Shop::getTree() ); }