Merge branch '1.6-CSVAdvanced' of https://github.com/PhpMadman/PrestaShop into PhpMadman-1.6-CSVAdvanced

2013-12-04 18:39:33 +01:00
parent 36a70d83d5 1dd7d6afcc
commit 7140a63272
2 changed files with 79 additions and 9 deletions
@@ -39,6 +39,10 @@ class AdminWarehousesControllerCore extends AdminController
 		$this->multishop_context = Shop::CONTEXT_ALL;

 		$this->fields_list = array(
+			'id_warehouse'	=> array(
+				'title' => $this->l('ID'),
+				'width' => 50,
+			),
 			'reference'	=> array(
 				'title' => $this->l('Reference'),
 			),