Index: branches/5.2.x/units/orders/orders_event_handler.php
===================================================================
diff -u -N -r16015 -r16136
--- branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 16015)
+++ branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 16136)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_event_handler.php 16015 2014-03-19 20:18:11Z alex $
+* @version	$Id: orders_event_handler.php 16136 2015-03-21 10:54:21Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -1693,27 +1693,37 @@
 			$inv_object =& $this->getInventoryObject($product_object, $combination_item, $combinations[ $rec['ProductId'].'_'.$rec['OptionsSalt'] ]);
 
 			$lack = $rec['Quantity'] - $rec['QuantityReserved'];
-			if ($lack > 0) {
-				// reserve lack or what is available (in case if we need to reserve anything, by Alex)
-				$to_reserve = min($lack, $inv_object->GetDBField('QtyInStock') - $product_object->GetDBField('QtyInStockMin'));
 
-			if ($to_reserve < $lack) $event->status = kEvent::erFAIL; // if we can't reserve the full lack
+			if ( $lack > 0 ) {
+				// Reserve lack or what is available (in case if we need to reserve anything, by Alex).
+				$to_reserve = min(
+					$lack,
+					$inv_object->GetDBField('QtyInStock') - $product_object->GetDBField('QtyInStockMin')
+				);
 
-			//reserve in order
-			$order_item->SetDBFieldsFromHash($rec);
-			$order_item->SetDBField('QuantityReserved', $rec['QuantityReserved'] + $to_reserve);
-			$order_item->SetId($rec['OrderItemId']);
-			$order_item->Update();
+				// If we can't reserve the full lack.
+				if ( $to_reserve < $lack ) {
+					$event->status = kEvent::erFAIL;
+				}
 
-			//update product - increase reserved, decrease in stock
+				// Reserve in order.
+				$order_item->SetDBFieldsFromHash($rec);
+				$order_item->SetDBField('QuantityReserved', $rec['QuantityReserved'] + $to_reserve);
+				$new_lack = $order_item->GetDBField('Quantity') - $order_item->GetDBField('QuantityReserved');
+				$order_item->SetDBField('BackOrderFlag', abs($new_lack) <= 0.0001 ? 0 : 1);
+				$order_item->SetId($rec['OrderItemId']);
+				$order_item->Update();
+
+				// Update product - increase reserved, decrease in stock.
 				$inv_object->SetDBField('QtyReserved', $inv_object->GetDBField('QtyReserved') + $to_reserve);
 				$inv_object->SetDBField('QtyInStock', $inv_object->GetDBField('QtyInStock') - $to_reserve);
 				$inv_object->SetDBField('QtyBackOrdered', $inv_object->GetDBField('QtyBackOrdered') - $to_reserve);
 				$inv_object->Update();
 
-				if ($product_object->GetDBField('InventoryStatus') == 2) {
-					// inventory by options, then restore changed combination values back to common $combinations array !!!
-					$combinations[ $rec['ProductId'].'_'.$rec['OptionsSalt'] ] = $inv_object->GetFieldValues();
+				if ( $product_object->GetDBField('InventoryStatus') == 2 ) {
+					// Inventory by options, then restore changed combination
+					// values back to common $combinations array !!!
+					$combinations[$rec['ProductId'] . '_' . $rec['OptionsSalt']] = $inv_object->GetFieldValues();
 				}
 			}
 			$order_items->GoNext();