Index: branches/5.2.x/units/orders/orders_event_handler.php
===================================================================
diff -u -N -r16237 -r16238
--- branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 16237)
+++ branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 16238)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_event_handler.php 16237 2015-09-02 20:05:13Z alex $
+* @version	$Id: orders_event_handler.php 16238 2015-09-02 20:12:35Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -2782,7 +2782,7 @@
 		$ord_id = $order->GetId();
 
 		$shipping_option = $order->GetDBField('ShippingOption');
-		$backorder_select = $shipping_option == 0 ? '0' : 'oi.BackOrderFlag';
+		$backorder_select = $shipping_option == 0 ? '0' : '%s.BackOrderFlag';
 
 
 		// setting PackageNum to 0 for Non-tangible items, for tangibles first package num is always 1
@@ -2805,7 +2805,7 @@
 		//			2 => ProductId
 		// 3 => Shipping PackageNum
 		$query = 'SELECT
-					'.$backorder_select.' AS BackOrderFlagCalc,
+					' . sprintf($backorder_select, $table_prefix . 'OrderItems') . ' AS BackOrderFlagCalc,
 					PackageNum,
 					ProductName,
 					ShippingTypeId,
@@ -2925,10 +2925,10 @@
 						break;
 
 					case PRODUCT_TYPE_TANGIBLE:
-						$sql = 'SELECT '.$backorder_select.' AS BackOrderFlagCalc, oi.*
-								FROM '.TABLE_PREFIX.'OrderItems oi
-								LEFT JOIN '.TABLE_PREFIX.'Products p ON p.ProductId = oi.ProductId
-								WHERE (OrderId = %s) AND (p.Type = '.PRODUCT_TYPE_TANGIBLE.')
+						$sql = 'SELECT ' . sprintf($backorder_select, 'oi') . ' AS BackOrderFlagCalc, oi.*
+								FROM ' . TABLE_PREFIX . 'OrderItems oi
+								LEFT JOIN ' . TABLE_PREFIX . 'Products p ON p.ProductId = oi.ProductId
+								WHERE (OrderId = %s) AND (p.Type = ' . PRODUCT_TYPE_TANGIBLE . ')
 								HAVING BackOrderFlagCalc = 0';
 
 							$products = $this->Conn->Query( sprintf($sql, $ord_id) );