// Fixed #PSTEST-646

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13006 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-06 09:18:01 +00:00
parent 9359de0f48
commit db6cb33b3f
1 changed files with 8 additions and 1 deletions
@@ -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'
 				)