diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index bd5b3b703..b8d943976 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -2660,6 +2660,10 @@ class AdminProductsControllerCore extends AdminController
 					$product_supplier->id_product = $product->id;
 					$product_supplier->id_product_attribute = 0;
 					$product_supplier->id_supplier = $id;
+					if ($this->context->currency->id)
+						$product_supplier->id_currency = (int)$this->context->currency->id;
+					else
+						$product_supplier->id_currency = (int)Configuration::get('PS_CURRENCY_DEFAULT');
 					$product_supplier->save();
 
 					$associated_suppliers[] = $product_supplier;
diff --git a/install-dev/fixtures/apple/data/product_supplier.xml b/install-dev/fixtures/apple/data/product_supplier.xml
index 59c4ce5ab..27b34a75f 100644
--- a/install-dev/fixtures/apple/data/product_supplier.xml
+++ b/install-dev/fixtures/apple/data/product_supplier.xml
@@ -8,39 +8,39 @@
     <field name="product_supplier_price_te"/>
   </fields>
   <entities>
-    <product_supplier id="product_supplier_1" id_product="iPod_Nano" id_product_attribute="" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
-    <product_supplier id="product_supplier_2" id_product="iPod_Nano" id_product_attribute="product_attribute_25" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
-    <product_supplier id="product_supplier_3" id_product="iPod_Nano" id_product_attribute="product_attribute_26" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
-    <product_supplier id="product_supplier_4" id_product="iPod_Nano" id_product_attribute="product_attribute_27" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
-    <product_supplier id="product_supplier_5" id_product="iPod_Nano" id_product_attribute="product_attribute_28" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
-    <product_supplier id="product_supplier_6" id_product="iPod_Nano" id_product_attribute="product_attribute_29" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
-    <product_supplier id="product_supplier_7" id_product="iPod_Nano" id_product_attribute="product_attribute_30" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
-    <product_supplier id="product_supplier_8" id_product="iPod_Nano" id_product_attribute="product_attribute_31" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
-    <product_supplier id="product_supplier_9" id_product="iPod_Nano" id_product_attribute="product_attribute_32" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
-    <product_supplier id="product_supplier_10" id_product="iPod_Nano" id_product_attribute="product_attribute_33" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
-    <product_supplier id="product_supplier_11" id_product="iPod_Nano" id_product_attribute="product_attribute_34" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
-    <product_supplier id="product_supplier_12" id_product="iPod_Nano" id_product_attribute="product_attribute_35" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
-    <product_supplier id="product_supplier_13" id_product="iPod_Nano" id_product_attribute="product_attribute_36" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
-    <product_supplier id="product_supplier_14" id_product="iPod_Nano" id_product_attribute="product_attribute_39" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
-    <product_supplier id="product_supplier_15" id_product="iPod_Nano" id_product_attribute="product_attribute_40" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
-    <product_supplier id="product_supplier_16" id_product="iPod_Nano" id_product_attribute="product_attribute_41" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
-    <product_supplier id="product_supplier_17" id_product="iPod_Nano" id_product_attribute="product_attribute_42" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
-    <product_supplier id="product_supplier_18" id_product="MacBook_Air" id_product_attribute="" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
-    <product_supplier id="product_supplier_19" id_product="MacBook_Air" id_product_attribute="product_attribute_12" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
-    <product_supplier id="product_supplier_20" id_product="MacBook_Air" id_product_attribute="product_attribute_13" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
-    <product_supplier id="product_supplier_21" id_product="MacBook_Air" id_product_attribute="product_attribute_14" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
-    <product_supplier id="product_supplier_22" id_product="MacBook_Air" id_product_attribute="product_attribute_15" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
-    <product_supplier id="product_supplier_23" id_product="Belkin_Leather_Folio_for_iPod_nano_-_Black_Chocolate" id_product_attribute="" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
-    <product_supplier id="product_supplier_24" id_product="iPod_shuffle" id_product_attribute="" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
-    <product_supplier id="product_supplier_25" id_product="iPod_shuffle" id_product_attribute="product_attribute_7" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
-    <product_supplier id="product_supplier_26" id_product="iPod_shuffle" id_product_attribute="product_attribute_8" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
-    <product_supplier id="product_supplier_27" id_product="iPod_shuffle" id_product_attribute="product_attribute_9" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
-    <product_supplier id="product_supplier_28" id_product="iPod_shuffle" id_product_attribute="product_attribute_10" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
-    <product_supplier id="product_supplier_30" id_product="MacBook" id_product_attribute="" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
-    <product_supplier id="product_supplier_31" id_product="iPod_touch" id_product_attribute="" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
-    <product_supplier id="product_supplier_32" id_product="iPod_touch" id_product_attribute="product_attribute_19" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
-    <product_supplier id="product_supplier_33" id_product="iPod_touch" id_product_attribute="product_attribute_22" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
-    <product_supplier id="product_supplier_34" id_product="iPod_touch" id_product_attribute="product_attribute_23" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000"/>
-    <product_supplier id="product_supplier_35" id_product="Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone" id_product_attribute="" id_supplier="Shure_Online_Store" product_supplier_reference="" product_supplier_price_te="0.000000"/>
+    <product_supplier id="product_supplier_1" id_product="iPod_Nano" id_product_attribute="" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000" id_currency="1"/>
+    <product_supplier id="product_supplier_2" id_product="iPod_Nano" id_product_attribute="product_attribute_25" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000" id_currency="1"/>
+    <product_supplier id="product_supplier_3" id_product="iPod_Nano" id_product_attribute="product_attribute_26" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000" id_currency="1"/>
+    <product_supplier id="product_supplier_4" id_product="iPod_Nano" id_product_attribute="product_attribute_27" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000" id_currency="1"/>
+    <product_supplier id="product_supplier_5" id_product="iPod_Nano" id_product_attribute="product_attribute_28" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000" id_currency="1"/>
+    <product_supplier id="product_supplier_6" id_product="iPod_Nano" id_product_attribute="product_attribute_29" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000" id_currency="1"/>
+    <product_supplier id="product_supplier_7" id_product="iPod_Nano" id_product_attribute="product_attribute_30" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000" id_currency="1"/>
+    <product_supplier id="product_supplier_8" id_product="iPod_Nano" id_product_attribute="product_attribute_31" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000" id_currency="1"/>
+    <product_supplier id="product_supplier_9" id_product="iPod_Nano" id_product_attribute="product_attribute_32" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000" id_currency="1"/>
+    <product_supplier id="product_supplier_10" id_product="iPod_Nano" id_product_attribute="product_attribute_33" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000" id_currency="1"/>
+    <product_supplier id="product_supplier_11" id_product="iPod_Nano" id_product_attribute="product_attribute_34" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000" id_currency="1"/>
+    <product_supplier id="product_supplier_12" id_product="iPod_Nano" id_product_attribute="product_attribute_35" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000" id_currency="1"/>
+    <product_supplier id="product_supplier_13" id_product="iPod_Nano" id_product_attribute="product_attribute_36" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000" id_currency="1"/>
+    <product_supplier id="product_supplier_14" id_product="iPod_Nano" id_product_attribute="product_attribute_39" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000" id_currency="1"/>
+    <product_supplier id="product_supplier_15" id_product="iPod_Nano" id_product_attribute="product_attribute_40" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000" id_currency="1"/>
+    <product_supplier id="product_supplier_16" id_product="iPod_Nano" id_product_attribute="product_attribute_41" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000" id_currency="1"/>
+    <product_supplier id="product_supplier_17" id_product="iPod_Nano" id_product_attribute="product_attribute_42" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000" id_currency="1"/>
+    <product_supplier id="product_supplier_18" id_product="MacBook_Air" id_product_attribute="" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000" id_currency="1"/>
+    <product_supplier id="product_supplier_19" id_product="MacBook_Air" id_product_attribute="product_attribute_12" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000" id_currency="1"/>
+    <product_supplier id="product_supplier_20" id_product="MacBook_Air" id_product_attribute="product_attribute_13" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000" id_currency="1"/>
+    <product_supplier id="product_supplier_21" id_product="MacBook_Air" id_product_attribute="product_attribute_14" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000" id_currency="1"/>
+    <product_supplier id="product_supplier_22" id_product="MacBook_Air" id_product_attribute="product_attribute_15" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000" id_currency="1"/>
+    <product_supplier id="product_supplier_23" id_product="Belkin_Leather_Folio_for_iPod_nano_-_Black_Chocolate" id_product_attribute="" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000" id_currency="1"/>
+    <product_supplier id="product_supplier_24" id_product="iPod_shuffle" id_product_attribute="" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000" id_currency="1"/>
+    <product_supplier id="product_supplier_25" id_product="iPod_shuffle" id_product_attribute="product_attribute_7" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000" id_currency="1"/>
+    <product_supplier id="product_supplier_26" id_product="iPod_shuffle" id_product_attribute="product_attribute_8" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000" id_currency="1"/>
+    <product_supplier id="product_supplier_27" id_product="iPod_shuffle" id_product_attribute="product_attribute_9" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000" id_currency="1"/>
+    <product_supplier id="product_supplier_28" id_product="iPod_shuffle" id_product_attribute="product_attribute_10" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000" id_currency="1"/>
+    <product_supplier id="product_supplier_30" id_product="MacBook" id_product_attribute="" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000" id_currency="1"/>
+    <product_supplier id="product_supplier_31" id_product="iPod_touch" id_product_attribute="" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000" id_currency="1"/>
+    <product_supplier id="product_supplier_32" id_product="iPod_touch" id_product_attribute="product_attribute_19" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000" id_currency="1"/>
+    <product_supplier id="product_supplier_33" id_product="iPod_touch" id_product_attribute="product_attribute_22" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000" id_currency="1"/>
+    <product_supplier id="product_supplier_34" id_product="iPod_touch" id_product_attribute="product_attribute_23" id_supplier="AppleStore" product_supplier_reference="" product_supplier_price_te="0.000000" id_currency="1"/>
+    <product_supplier id="product_supplier_35" id_product="Shure_SE210_Sound-Isolating_Earphones_for_iPod_and_iPhone" id_product_attribute="" id_supplier="Shure_Online_Store" product_supplier_reference="" product_supplier_price_te="0.000000" id_currency="1"/>
   </entities>
 </entity_product_supplier>