From 9cece75035a2c48e6351dc353d68e2ef5df620b6 Mon Sep 17 00:00:00 2001
From: bMancone <brice.mancone@prestashop.com>
Date: Mon, 6 Feb 2012 09:18:01 +0000
Subject: [PATCH] // Fixed #PSTEST-646

---
 controllers/admin/AdminWarehousesController.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/controllers/admin/AdminWarehousesController.php b/controllers/admin/AdminWarehousesController.php
index 4cb5dd46e..585e5ba3e 100644
--- a/controllers/admin/AdminWarehousesController.php
+++ b/controllers/admin/AdminWarehousesController.php
@@ -310,6 +310,13 @@ class AdminWarehousesControllerCore extends AdminController
 				'desc' => $this->l('Inventory valuation method')
 			);
 
+			//get currencies list
+			$currencies = Currency::getCurrencies();
+			$id_default_currency = Configuration::get('PS_CURRENCY_DEFAULT');
+			$default_currency = Currency::getCurrency($id_default_currency);
+			if ($default_currency)
+				$currencies = array_merge(array($default_currency, '-'), $currencies);
+
 			$this->fields_form['input'][] = array(
 				'type' => 'select',
 				'label' => $this->l('Stock valuation currency:'),
@@ -317,7 +324,7 @@ class AdminWarehousesControllerCore extends AdminController
 				'name' => 'id_currency',
 				'required' => true,
 				'options' => array(
-					'query' => Currency::getCurrencies(),
+					'query' => $currencies,
 					'id' => 'id_currency',
 					'name' => 'name'
 				)