Index: branches/5.1.x/units/orders/orders_event_handler.php
===================================================================
diff -u -N -r13578 -r13745
--- branches/5.1.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 13578)
+++ branches/5.1.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 13745)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_event_handler.php 13578 2010-05-19 07:25:51Z alex $
+* @version	$Id: orders_event_handler.php 13745 2010-06-09 17:32:28Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -1030,7 +1030,9 @@
 
 		if ($event->Special == 'last') {
 			// return last order id (for using on thank you page)
-			return $this->Application->RecallVar('front_order_id');
+			$order_id = $this->Application->RecallVar('front_order_id');
+
+			return $order_id > 0 ? $order_id : FAKE_ORDER_ID; // FAKE_ORDER_ID helps to keep parent filter for order items set in "kDBList::linkToParent"
 		}
 
 		$ses_id = $this->Application->RecallVar( $event->getPrefixSpecial(true) . '_id' );
@@ -1093,7 +1095,7 @@
 
 		$object->SetDBField('Number', $this->getNextOrderNumber($event));
 		$object->SetDBField('SubNumber', 0);
-		$object->SetDBField('Type', ORDER_STATUS_INCOMPLETE);
+		$object->SetDBField('Status', ORDER_STATUS_INCOMPLETE);
 		$object->SetDBField('VisitId', $this->Application->RecallVar('visit_id') );
 
 		// get user
@@ -2644,7 +2646,6 @@
 			$item_data = $passed_item_data;
 			$object->SetDBField('ItemData', serialize($item_data));
 			$object->Create();
-			if( $this->UseTempTables($event) ) $object->SetTempId();
 		}
 		else {
 			return false; // item requiring to set qty to 0, meaning already does not exist
@@ -2794,9 +2795,6 @@
 		}
 		else {
 			$object->Create();
-			if ($this->UseTempTables($event)) {
-				$object->setTempID();
-			}
 		}
 
 		$this->Application->HandleEvent($ord_event, 'ord:OnRecalculateItems');