From cd6fa32ec7ce13607dd289fee8f4101f0f414e76 Mon Sep 17 00:00:00 2001
From: mDeflotte <maxence.deflotte@prestashop.com>
Date: Wed, 25 Jan 2012 16:59:55 +0000
Subject: [PATCH] [-] BO : #PSTEST-582 - Select default currency on tab tab
 product > supplier

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12693 b9a71923-0436-4b27-9f14-aed3839534dd
---
 .../default/template/controllers/products/suppliers.tpl     | 6 ++++--
 controllers/admin/AdminProductsController.php               | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/products/suppliers.tpl b/admin-dev/themes/default/template/controllers/products/suppliers.tpl
index 42fa7d482..3252b3b3b 100644
--- a/admin-dev/themes/default/template/controllers/products/suppliers.tpl
+++ b/admin-dev/themes/default/template/controllers/products/suppliers.tpl
@@ -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}>
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 56e5a3b95..1c14942ba 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -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