From 2d4a9167fafbec7fe92fb43b7558e8687f422460 Mon Sep 17 00:00:00 2001
From: mDeflotte <maxence.deflotte@prestashop.com>
Date: Tue, 31 Jan 2012 10:50:24 +0000
Subject: [PATCH] // Bug Fix : use the PS_COUNTRY_DEFAULT to calculate shipping
 fees

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12837 b9a71923-0436-4b27-9f14-aed3839534dd
---
 classes/Carrier.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/Carrier.php b/classes/Carrier.php
index c29cfd16f..599775a2c 100644
--- a/classes/Carrier.php
+++ b/classes/Carrier.php
@@ -1065,7 +1065,7 @@ class CarrierCore extends ObjectModel
 			}
 			else
 			{
-				$country = new Country(Context::getContext()->shop->getAddress()->id_country);
+				$country = new Country(Configuration::get('PS_COUNTRY_DEFAULT'));
 				$id_zone = $country->id_zone;
 			}
 			$carriers = Carrier::getCarriersForOrder($id_zone, Context::getContext()->customer->getGroups());