Index: uc_multiprice.module
===================================================================
--- uc_multiprice.module	(revision 263)
+++ uc_multiprice.module	(working copy)
@@ -451,7 +451,12 @@
   // if the user has a multiprice enabled role then don't change currency
   // as role based pricing is in default currency
   if (!array_intersect(array_keys($user_roles), $enabled_roles)) {
-    $cid = uc_multiprice_country_id();
+    if ($context['subject']['order']->order_status == 'completed') {
+      $cid = $context['subject']['order']->delivery_country;
+    }
+	else {
+      $cid = uc_multiprice_country_id();	
+	}
     $result = db_query("SELECT * FROM {uc_multiprice_currencies} WHERE country_id = %d", $cid);
     if ($currency = db_fetch_array($result)) {
       $currency['dec'] = $currency['deci'];