Index: branches/5.2.x/units/orders/orders_event_handler.php
===================================================================
diff -u -N -r16292 -r16366
--- branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 16292)
+++ branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 16366)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_event_handler.php 16292 2015-10-25 11:14:31Z alex $
+* @version	$Id: orders_event_handler.php 16366 2016-07-12 08:00:32Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -318,16 +318,14 @@
 			$fields_hash['AffiliateId'] = $affiliate_id;
 		}
 
-		$id_field = $this->Application->getUnitOption($event->Prefix, 'IDField');
-		$table_name = $this->Application->getUnitOption($event->Prefix, 'TableName');
+		/** @var OrdersItem $object */
+		$object = $this->Application->recallObject($event->Prefix . '.-item', null, array('skip_autoload' => true));
+		$object->Load($order_id);
 
-		$this->Conn->doUpdate($fields_hash, $table_name, $id_field . ' = ' . $order_id);
-
-		$object = $event->getObject();
-		/* @var $object kDBItem */
-
-		// set user id to object, since it will be used during order update from OnRecalculateItems event
-		$object->SetDBField('PortalUserId', $user->GetID());
+		if ( $object->isLoaded() ) {
+			$object->SetDBFieldsFromHash($fields_hash);
+			$object->Update();
+		}
 	}
 
 	function isAffiliate($user_id)