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

[-] BO : #PSTEST-582 - Select default currency on tab tab product > supplier

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12693 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2012-01-25 16:59:55 +00:00
parent 4958802ccf
commit cd6fa32ec7
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/products/suppliers.tpl
+4 -2
View File
@@ -93,12 +93,14 @@
{foreach $attributes AS $index => $attribute}
{assign var=reference value=''}
{assign var=price_te value=''}
{assign var=id_currency value=''}
{assign var=id_currency value=$id_default_currency}
{foreach from=$associated_suppliers_collection item=asc}
{if $asc->id_product == $attribute['id_product'] && $asc->id_product_attribute == $attribute['id_product_attribute'] && $asc->id_supplier == $supplier->id_supplier}
{assign var=reference value=$asc->product_supplier_reference}
{assign var=price_te value=Tools::ps_round($asc->product_supplier_price_te, 2)}
{assign var=id_currency value=$asc->id_currency}
{if $asc->id_currency}
{assign var=id_currency value=$asc->id_currency}
{/if}
{/if}
{/foreach}
<tr {if $index is odd}class="alt_row"{/if}>
controllers/admin/AdminProductsController.php
+2 -1
View File
@@ -3587,7 +3587,8 @@ class AdminProductsControllerCore extends AdminController
'currencies' => Currency::getCurrencies(),
'product' => $obj,
'link' => $this->context->link,
'token' => $this->token
'token' => $this->token,
'id_default_currency' => Configuration::get('PS_CURRENCY_DEFAULT'),
));
}
else