// 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

@@ -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()
 			);
 		}