From 0e9472dd719c22da4851b07f3a50db1c5b43ce99 Mon Sep 17 00:00:00 2001
From: bMancone <brice.mancone@prestashop.com>
Date: Tue, 27 Dec 2011 16:25:34 +0000
Subject: [PATCH] // Improved StockInstantState / StockMvt

---
 controllers/admin/AdminImportController.php   |  2 +-
 .../AdminStockInstantStateController.php      |  2 ++
 controllers/admin/AdminStockMvtController.php | 19 +++++++++++++------
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php
index 695210604..716608cb8 100644
--- a/controllers/admin/AdminImportController.php
+++ b/controllers/admin/AdminImportController.php
@@ -312,7 +312,7 @@ class AdminImportControllerCore extends AdminController
 				//Overwrite validators AS name is not MultiLangField
 				self::$validators = array(
 					'description' => array('AdminImportController', 'createMultiLangField'),
-					'description_short' => array('AdminImportController', 'createMultiLangField'),
+					'short_description' => array('AdminImportController', 'createMultiLangField'),
 					'meta_title' => array('AdminImportController', 'createMultiLangField'),
 					'meta_keywords' => array('AdminImportController', 'createMultiLangField'),
 					'meta_description' => array('AdminImportController', 'createMultiLangField'),
diff --git a/controllers/admin/AdminStockInstantStateController.php b/controllers/admin/AdminStockInstantStateController.php
index 8c86fb234..d6465b8c0 100644
--- a/controllers/admin/AdminStockInstantStateController.php
+++ b/controllers/admin/AdminStockInstantStateController.php
@@ -202,6 +202,8 @@ class AdminStockInstantStateControllerCore extends AdminController
 			$query->select('SUM(price_te * physical_quantity) as valuation');
 			$query->from('stock');
 			$query->where('id_product = '.(int)$item['id_product'].' AND id_product_attribute = '.(int)$item['id_product_attribute']);
+			if ($this->getCurrentCoverageWarehouse() != -1)
+				$query->where('id_warehouse = '.(int)$this->getCurrentCoverageWarehouse());
 			$res = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow($query);
 
 			$item['physical_quantity'] = $res['physical_quantity'];
diff --git a/controllers/admin/AdminStockMvtController.php b/controllers/admin/AdminStockMvtController.php
index 0d8455317..430609904 100644
--- a/controllers/admin/AdminStockMvtController.php
+++ b/controllers/admin/AdminStockMvtController.php
@@ -61,6 +61,12 @@ class AdminStockMvtControllerCore extends AdminController
 				'title' => $this->l('Name'),
 				'havingFilter' => true
 			),
+			'warehouse_name' => array(
+				'title' => $this->l('Warehouse'),
+				'havingFilter' => false,
+				'orderby' => true,
+				'search' => false,
+			),
 			'sign' => array(
 				'title' => $this->l('Sign'),
 				'width' => 100,
@@ -123,12 +129,13 @@ class AdminStockMvtControllerCore extends AdminController
 		// overrides select
 		$this->_select = '
 			CONCAT(pl.name, \' \', GROUP_CONCAT(IFNULL(al.name, \'\'), \'\')) product_name,
-			CONCAT(a.employee_lastname, \' \', a.employee_firstname) AS employee,
-			mrl.name AS reason,
-			stock.reference AS product_reference,
-			stock.ean13 AS product_ean13,
-			stock.upc AS product_upc,
-			w.id_currency AS id_currency';
+			CONCAT(a.employee_lastname, \' \', a.employee_firstname) as employee,
+			mrl.name as reason,
+			stock.reference as product_reference,
+			stock.ean13 as product_ean13,
+			stock.upc as product_upc,
+			w.id_currency as id_currency,
+			w.name as warehouse_name';
 
 		// overrides join
 		$this->_join = 'INNER JOIN '._DB_PREFIX_.'stock stock ON a.id_stock = stock.id_stock