Index: branches/5.3.x/units/shipping/shipping_event_handler.php
===================================================================
diff -u -N -r15492 -r16522
--- branches/5.3.x/units/shipping/shipping_event_handler.php	(.../shipping_event_handler.php)	(revision 15492)
+++ branches/5.3.x/units/shipping/shipping_event_handler.php	(.../shipping_event_handler.php)	(revision 16522)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: shipping_event_handler.php 15149 2012-03-04 09:05:03Z alex $
+* @version	$Id: shipping_event_handler.php 16522 2017-01-20 20:28:16Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -49,14 +49,14 @@
 			return;
 		}
 
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$format = '%01.' . $object->GetDBField('PrecisionAfterSep') . 'f'; // %01.2f
 		$zero_if_empty = $object->GetDBField('ZeroIfEmpty');
 
+		/** @var kDBItem $sc_object */
 		$sc_object = $this->Application->recallObject('sc', null, Array ('raise_warnings' => 0));
-		/* @var $sc_object kDBItem */
 
 		// change default shipping cost values ("Costs" tab on shipping editing) based on field from "Shipping Type"
 		$flat_options = $sc_object->GetFieldOptions('Flat');
@@ -78,16 +78,16 @@
 	 */
 	function OnApplyModifier($event)
 	{
+		/** @var kDBItem $cost_object */
 		$cost_object = $this->Application->recallObject('sc');
-		/* @var $cost_object kDBItem */
 
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$operation = $this->Application->GetVar('operation');
 
+		/** @var kFormatter $formatter */
 		$formatter = $this->Application->recallObject('kFormatter');
-		/* @var $formatter kFormatter */
 
 		$modify_by = $formatter->TypeCast($this->Application->GetVar('modify_by'), array('type'=>'float'));
 		$cost_type = $object->GetDBField('CostType');
@@ -233,16 +233,16 @@
 	{
 		parent::OnPreSaveCreated($event);
 
+		/** @var kDBItem $object */
 		$object = $event->getObject( Array ('skip_autoload' => true) );
-		/* @var $object kDBItem */
 
 		$object->SetDBField('PortalGroups', ',' . $this->Application->ConfigValue('User_LoggedInGroup') . ',');
 	}
 
 	function UpdateGroups($event)
 	{
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		if ( $event->Name == 'OnPreSaveCreated' ) {
 			$default_group = $this->Application->ConfigValue('User_LoggedInGroup');