Index: branches/5.1.x/units/shipping_quote_engines/usps.php
===================================================================
diff -u -r13100 -r13465
--- branches/5.1.x/units/shipping_quote_engines/usps.php	(.../usps.php)	(revision 13100)
+++ branches/5.1.x/units/shipping_quote_engines/usps.php	(.../usps.php)	(revision 13465)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: usps.php 12739 2009-10-20 19:38:22Z alex $
+* @version	$Id: usps.php 13465 2010-04-28 15:08:00Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -84,16 +84,9 @@
 		$country = $this->Application->ConfigValue('Comm_Shipping_Country');
 
 		if ($country != '') {
-			$db =& $this->Application->GetADODBConnection();
-			$this->shipping_origin_country = $db->GetOne(
-				'SELECT DestAbbr2
-					FROM '.TABLE_PREFIX.'StdDestinations
-					WHERE
-						DestAbbr = '.$db->qstr($country).'
-						AND destType = 1
-				'
-			);
+			$this->shipping_origin_country = $this->GetUSPSCountry($country, '');
 		}
+
 		$contact_name = trim($this->_prepare_xml_param($this->Application->ConfigValue('Comm_Contacts_Name')));
 		$split_pos = strpos($contact_name, ' ');
 		if ($split_pos === false) {
@@ -1003,11 +996,14 @@
 		return array('TrackingNumber' => $TrackingNumber, 'PostnetBarCode' => $PostnetBarCode, 'Postage' => $Postage);
 	}
 
-	function GetUSPSCountry($country)
+	function GetUSPSCountry($country, $default = 'US')
 	{
-		$country = $this->Application->Conn->GetOne('SELECT DestAbbr2 FROM '.TABLE_PREFIX.'StdDestinations WHERE DestAbbr = '.$this->Application->Conn->qstr($country));
-		if ( $country == '' ) $country = 'US';
-		return $country;
+		$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+		/* @var $cs_helper kCountryStatesHelper */
+
+		$country = $cs_helper->getCountryIso($country);
+
+		return $country == '' ? $default : $country;
 	}
 
 	function GetShippingQuotes($params = null)