diff --git a/admin-dev/themes/default/template/controllers/warehouses/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/warehouses/helpers/view/view.tpl
index 65eaa9b1e..7a3a95299 100644
--- a/admin-dev/themes/default/template/controllers/warehouses/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/warehouses/helpers/view/view.tpl
@@ -69,7 +69,7 @@
 					</tr>
 					<tr>
 						<td>{l s='Stock valuation:'}</td>
-						<td>{$currency->prefix} {$warehouse_value} {$currency->suffix}</td>
+						<td>{$warehouse_value}</td>
 					</tr>
 				</table>
 			</fieldset>
diff --git a/classes/stock/Warehouse.php b/classes/stock/Warehouse.php
index 244f1283d..6f635c469 100644
--- a/classes/stock/Warehouse.php
+++ b/classes/stock/Warehouse.php
@@ -425,7 +425,7 @@ class WarehouseCore extends ObjectModel
 	public function getStockValue()
 	{
 		$query = new DbQuery();
-		$query->select('SUM(s.`price_te`)');
+		$query->select('SUM(s.`price_te` * s.`physical_quantity`)');
 		$query->from('stock', 's');
 		$query->where('s.`id_warehouse` = '.(int)$this->id);
 
diff --git a/controllers/admin/AdminWarehousesController.php b/controllers/admin/AdminWarehousesController.php
index 3d8971a0c..91fe9323f 100644
--- a/controllers/admin/AdminWarehousesController.php
+++ b/controllers/admin/AdminWarehousesController.php
@@ -413,7 +413,7 @@ class AdminWarehousesControllerCore extends AdminController
 			'address' => $address,
 			'shops' => $shops,
 			'warehouse_num_products' => $warehouse->getNumberOfProducts(),
-			'warehouse_value' => Tools::ps_round($warehouse->getStockValue(), 2),
+			'warehouse_value' => Tools::displayPrice(Tools::ps_round($warehouse->getStockValue(), 2), $currency),
 			'warehouse_quantities' => $warehouse->getQuantitiesofProducts(),
 		);