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

// Small fix

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17165 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard
2012-09-04 12:53:53 +00:00
parent 9315b2a7ca
commit f879b2e9b4
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminWarehousesController.php
+5 -9
View File
@@ -304,14 +304,7 @@ 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, array('id_currency' => 0, 'name' => '-')), $currencies);
// adds input valuation currency
$this->fields_form['input'][] = array(
'type' => 'select',
@@ -320,7 +313,7 @@ class AdminWarehousesControllerCore extends AdminController
'name' => 'id_currency',
'required' => true,
'options' => array(
'query' => $currencies,
'query' => Currency::getCurrencies(),
'id' => 'id_currency',
'name' => 'name'
)
@@ -380,6 +373,9 @@ class AdminWarehousesControllerCore extends AdminController
$this->fields_value['ids_shops[]'] = $ids_shop;
$this->fields_value['ids_carriers[]'] = $carriers;
if (!Validate::isLoadedObject($obj))
$this->fields_value['id_currency'] = (int)Configuration::get('PS_CURRENCY_DEFAULT');
return parent::renderForm();
}