Index: branches/5.1.x/units/orders/orders_item.php
===================================================================
diff -u -r13100 -r13465
--- branches/5.1.x/units/orders/orders_item.php	(.../orders_item.php)	(revision 13100)
+++ branches/5.1.x/units/orders/orders_item.php	(.../orders_item.php)	(revision 13465)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_item.php 12739 2009-10-20 19:38:22Z alex $
+* @version	$Id: orders_item.php 13465 2010-04-28 15:08:00Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -172,14 +172,15 @@
 		 */
 		function getTaxPercent()
 		{
-			$sql = 'SELECT DestId FROM '.TABLE_PREFIX.'StdDestinations WHERE DestType = %s AND DestAbbr = %s';
+			$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+			/* @var $cs_helper kCountryStatesHelper */
 
-			$shipping_country_id = (int) $this->Conn->GetOne( sprintf($sql, 1, $this->Conn->qstr($this->GetDBField('ShippingCountry') ) ) );
-			$shipping_state_id = (int) $this->Conn->GetOne( sprintf($sql, 2,  $this->Conn->qstr($this->GetDBField('ShippingState') ) ) );
+			$shipping_country_id = $cs_helper->getCountryStateId($this->GetDBField('ShippingCountry'), DESTINATION_TYPE_COUNTRY);
+			$shipping_state_id = $cs_helper->getCountryStateId($this->GetDBField('ShippingState'), DESTINATION_TYPE_STATE);
 			$shipping_zip = (string) $this->GetDBField('ShippingZip');
 
-			$billing_country_id = (int) $this->Conn->GetOne( sprintf($sql, 1, $this->Conn->qstr($this->GetDBField('BillingCountry') ) ) );
-			$billing_state_id = (int) $this->Conn->GetOne( sprintf($sql, 2, $this->Conn->qstr($this->GetDBField('BillingState') ) ) );
+			$billing_country_id = $cs_helper->getCountryStateId($this->GetDBField('BillingCountry'), DESTINATION_TYPE_COUNTRY);
+			$billing_state_id =  $cs_helper->getCountryStateId($this->GetDBField('BillingState'), DESTINATION_TYPE_STATE);
 			$billing_zip = (string) $this->GetDBField('BillingZip');
 
 			/*