Index: branches/5.1.x/units/shipping_quote_engines/shipping_quote_engine_event_handler.php
===================================================================
diff -u -r13100 -r13465
--- branches/5.1.x/units/shipping_quote_engines/shipping_quote_engine_event_handler.php	(.../shipping_quote_engine_event_handler.php)	(revision 13100)
+++ branches/5.1.x/units/shipping_quote_engines/shipping_quote_engine_event_handler.php	(.../shipping_quote_engine_event_handler.php)	(revision 13465)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: shipping_quote_engine_event_handler.php 12739 2009-10-20 19:38:22Z alex $
+* @version	$Id: shipping_quote_engine_event_handler.php 13465 2010-04-28 15:08:00Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -57,11 +57,14 @@
 		$object->SetDBField('Properties', $properties);
 
 		$from_country = $this->Application->ConfigValue('Comm_Shipping_Country');
-		if( mb_strlen($from_country) == 3)
-		{
-			$sql = 'SELECT DestAbbr2 FROM '.TABLE_PREFIX.'StdDestinations WHERE DestAbbr = "'.$from_country.'"';
-			$from_country = $this->Conn->GetOne($sql);
+		if (strlen($from_country) == 3) {
+			$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+			/* @var $cs_helper kCountryStatesHelper */
+
+			// get 2symbol ISO code from 3symbol ISO code
+			$from_country = $cs_helper->getCountryIso($from_country);
 		}
+
 		if( !function_exists('curl_init') )
 		{
 			$object->FieldErrors['Status']['pseudo'] = 'curl_not_present';