Index: branches/5.3.x/units/orders/orders_event_handler.php
===================================================================
diff -u -r15807 -r15899
--- branches/5.3.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 15807)
+++ branches/5.3.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 15899)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_event_handler.php 15807 2013-06-25 14:18:34Z alex $
+* @version	$Id: orders_event_handler.php 15899 2013-07-12 10:32:25Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -440,7 +440,10 @@
 	function OnCompleteOrder($event)
 	{
 		$this->LockTables($event);
-		if ( !$this->CheckQuantites($event) ) {
+		$reoccurring_order = substr($event->Special, 0, 9) == 'recurring';
+
+		if ( !$reoccurring_order && !$this->CheckQuantites($event) ) {
+			// don't check quantities (that causes recalculate) for reoccurring orders
 			return;
 		}
 
@@ -2916,7 +2919,8 @@
 						$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 (BackOrderFlagCalc = 0) AND (p.Type = '.PRODUCT_TYPE_TANGIBLE.')';
+								WHERE (OrderId = %s) AND (p.Type = '.PRODUCT_TYPE_TANGIBLE.')
+								HAVING BackOrderFlagCalc = 0';
 
 							$products = $this->Conn->Query( sprintf($sql, $ord_id) );
 							foreach ($products as $product) {