Index: branches/5.2.x/units/order_items/order_items_event_handler.php
===================================================================
diff -u -N -r16015 -r16516
--- branches/5.2.x/units/order_items/order_items_event_handler.php	(.../order_items_event_handler.php)	(revision 16015)
+++ branches/5.2.x/units/order_items/order_items_event_handler.php	(.../order_items_event_handler.php)	(revision 16516)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: order_items_event_handler.php 16015 2014-03-19 20:18:11Z alex $
+* @version	$Id: order_items_event_handler.php 16516 2017-01-20 14:12:22Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -51,8 +51,8 @@
 				// = allows selecting one item at a time, but we leave this code just in case :)
 				$product_ids = explode(',', $product_ids);
 
+				/** @var ProductsItem $product_object */
 				$product_object = $this->Application->recallObject('p.-item', null, array('skip_autoload' => true));
-				/* @var $product_object ProductsItem */
 
 				foreach ($product_ids as $product_id) {
 					$product_object->Load($product_id);
@@ -72,8 +72,8 @@
 						$this->Application->EventManager->openerStackPush('in-commerce/orders/order_product_edit', $url_params);
 					}
 					else {
+						/** @var OrdersEventHandler $orders_h */
 						$orders_h = $this->Application->recallObject('ord_EventHandler');
-						/* @var $orders_h OrdersEventHandler */
 
 						// 1 for PacakgeNum - temporary solution to overcome splitting into separate sub-orders
 						// of orders with items added through admin when approving them
@@ -101,13 +101,13 @@
 				return;
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject(Array ('skip_autoload' => true));
-			/* @var $object kDBItem */
 
 			$table_info = $object->getLinkedInfo();
 
+			/** @var OrdersItem $main_object */
 			$main_object = $this->Application->recallObject($table_info['ParentPrefix']);
-			/* @var $main_object OrdersItem */
 
 			foreach ($items_info as $id => $field_values) {
 				$object->Clear(); // otherwise validation errors will be passed to next object
@@ -169,16 +169,16 @@
 				return;
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$changed_fields = $object->GetChangedFields();
 
 			if ( $changed_fields ) {
 				$table_info = $object->getLinkedInfo();
 
+				/** @var OrdersItem $main_object */
 				$main_object = $this->Application->recallObject($table_info['ParentPrefix']);
-				/* @var $main_object OrdersItem */
 
 				$oi_string = $object->GetDBField('ProductId') . ':' . $object->GetDBField('OptionsSalt') . ':' . $object->GetDBField('BackOrderFlag');
 
@@ -301,8 +301,8 @@
 		{
 			parent::OnAfterItemLoad($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$item_info = $object->GetDBField('ItemData');
 
@@ -325,8 +325,8 @@
 		{
 			parent::SetCustomQuery($event);
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			$package_num = $event->getEventParam('package_num');
 			if ( $package_num ) {
@@ -352,15 +352,15 @@
 				return true;
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( !$object->isLoaded() ) {
 				return true;
 			}
 
+			/** @var kDBItem $order */
 			$order = $this->Application->recallObject('ord');
-			/* @var $order kDBItem */
 
 			if ( $order->isLoaded() && ($order->GetID() == $object->GetDBField('OrderId')) ) {
 				return $order->GetDBField('PortalUserId') == $this->Application->RecallVar('user_id');