dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fixed #PSTEST-646

Browse Source
This commit is contained in:
bMancone
2012-02-06 09:18:01 +00:00
parent ae7d9fb895
commit 9dcc1eb7a9
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminWarehousesController.php
+8 -1
View File
@@ -310,6 +310,13 @@ class AdminWarehousesControllerCore extends AdminController
'desc' => $this->l('Inventory valuation method') '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( $this->fields_form['input'][] = array(
'type' => 'select', 'type' => 'select',
'label' => $this->l('Stock valuation currency:'), 'label' => $this->l('Stock valuation currency:'),
@@ -317,7 +324,7 @@ class AdminWarehousesControllerCore extends AdminController
'name' => 'id_currency', 'name' => 'id_currency',
'required' => true, 'required' => true,
'options' => array( 'options' => array(
'query' => Currency::getCurrencies(), 'query' => $currencies,
'id' => 'id_currency', 'id' => 'id_currency',
'name' => 'name' 'name' => 'name'
) )