Index: branches/5.2.x/units/product_option_combinations/product_option_combinations_event_handler.php
===================================================================
diff -u -N -r16015 -r16516
--- branches/5.2.x/units/product_option_combinations/product_option_combinations_event_handler.php	(.../product_option_combinations_event_handler.php)	(revision 16015)
+++ branches/5.2.x/units/product_option_combinations/product_option_combinations_event_handler.php	(.../product_option_combinations_event_handler.php)	(revision 16516)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: product_option_combinations_event_handler.php 16015 2014-03-19 20:18:11Z alex $
+* @version	$Id: product_option_combinations_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
@@ -32,8 +32,8 @@
 		switch ($event->Name) {
 			case 'OnCreate':
 			case 'OnUpdate':
+				/** @var kDBItem $object */
 				$object = $event->getObject();
-				/* @var $object kDBItem */
 
 				$options = unserialize($object->GetDBField('Combination'));
 				ksort($options);
@@ -42,8 +42,8 @@
 
 			case 'OnMassDelete':
 				// delete only option combinations that has no associated inventory
+				/** @var kDBItem $object */
 				$object = $event->getObject();
-				/* @var $object kDBItem */
 
 				$ids = $event->getEventParam('ids');
 
@@ -92,8 +92,8 @@
 		}
 
 		if (!$recursed) {
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$salt = $fields['Combination'];
 			ksort($salt);
@@ -137,8 +137,8 @@
 		}
 
 		if (!$recursed) {
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$edit_id = $object->GetId();
 			$salt = $fields['Combination'];
@@ -169,8 +169,8 @@
 	 */
 	protected function OnCreate(kEvent $event)
 	{
+		/** @var kDBItem $object */
 		$object = $event->getObject(Array ('skip_autoload' => true));
-		/* @var $object kDBItem */
 
 		$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
 
@@ -202,8 +202,8 @@
 	 */
 	protected function OnUpdate(kEvent $event)
 	{
+		/** @var kDBItem $object */
 		$object = $event->getObject( Array('skip_autoload' => true) );
-		/* @var $object kDBItem */
 
 		$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
 		if($items_info)
@@ -248,8 +248,8 @@
 	 */
 	protected function OnItemBuild(kEvent $event)
 	{
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$this->dbBuild($object, $event);
 
@@ -265,8 +265,8 @@
 			$this->LoadItem($event);
 		}
 
+		/** @var Params $actions */
 		$actions = $this->Application->recallObject('kActions');
-		/* @var $actions Params */
 
 		$actions->Set($event->getPrefixSpecial() . '_GoTab', '');
 		$actions->Set($event->getPrefixSpecial() . '_GoId', '');
@@ -281,8 +281,8 @@
 	 */
 	protected function LoadItem(kEvent $event)
 	{
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$id = $this->getPassedID($event);
 
@@ -293,8 +293,8 @@
 		}
 
 		if ( $object->Load($id) ) {
+			/** @var Params $actions */
 			$actions = $this->Application->recallObject('kActions');
-			/* @var $actions Params */
 
 			$actions->Set($event->getPrefixSpecial() . '_id', $object->GetId());
 		}
@@ -336,8 +336,8 @@
 
 		$event->Init($event->Prefix, '-item');
 
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$options_mapping = $this->Application->GetVar('poc_mapping');
 		if ( !$options_mapping ) {
@@ -386,14 +386,14 @@
 		$inventory_status = $this->Conn->GetOne($sql);
 
 		if ( $inventory_status == ProductInventory::BY_OPTIONS ) {
+			/** @var kDBItem $live_object */
 			$live_object = $this->Application->recallObject($event->Prefix . '.itemlive', null, Array ('skip_autoload' => true));
-			/* @var $live_object kDBItem */
 
 			$live_object->SwitchToLive();
 			$live_object->Load($id);
 
+			/** @var kDBItem $temp_object */
 			$temp_object = $this->Application->recallObject($event->Prefix . '.itemtemp', null, Array ('skip_autoload' => true));
-			/* @var $temp_object kDBItem */
 
 			$temp_object->SwitchToTemp();
 			$temp_object->Load($id);