Index: branches/5.2.x/units/shipping_costs/shipping_costs_event_handler.php
===================================================================
diff -u -N -r16015 -r16516
--- branches/5.2.x/units/shipping_costs/shipping_costs_event_handler.php	(.../shipping_costs_event_handler.php)	(revision 16015)
+++ branches/5.2.x/units/shipping_costs/shipping_costs_event_handler.php	(.../shipping_costs_event_handler.php)	(revision 16516)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: shipping_costs_event_handler.php 16015 2014-03-19 20:18:11Z alex $
+* @version	$Id: shipping_costs_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
@@ -44,8 +44,8 @@
 	 */
 	protected function OnCreate(kEvent $event)
 	{
+		/** @var kDBItem $object */
 		$object = $event->getObject(Array ('skip_autoload' => true));
-		/* @var $object kDBItem */
 
 		$zones_object = $this->Application->recallObject('z');
 
@@ -172,11 +172,11 @@
 	 */
 	function OnClearAll($event)
 	{
+		/** @var kDBItem $object */
 		$object = $event->getObject(Array ('skip_autoload' => true));
-		/* @var $object kDBItem */
 
+		/** @var kDBItem $zones_object */
 		$zones_object = $this->Application->recallObject('z');
-		/* @var $zones_object kDBItem */
 
 		$sql = 'SELECT ZoneID
 				FROM ' . $zones_object->TableName . '
@@ -202,11 +202,11 @@
 	protected function customProcessing(kEvent $event, $type)
 	{
 		if ( $type == 'before' && $this->Application->GetVar('sc') ) {
+			/** @var kDBItem $shipping_obj */
 			$shipping_obj = $this->Application->recallObject('s');
-			/* @var $shipping_obj kDBItem */
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$zero_if_empty = $shipping_obj->GetDBField('ZeroIfEmpty');
 
@@ -247,17 +247,17 @@
 
 		$id = $event->getEventParam('id');
 
+		/** @var kDBItem $object */
 		$object = $this->Application->recallObject($event->Prefix . '.-item', $event->Prefix);
-		/* @var $object kDBItem */
 
 		$object->SwitchToTemp();
 		$object->Load($id);
 
+		/** @var kDBItem $shipping_obj */
 		$shipping_obj = $this->Application->recallObject('s');
-		/* @var $shipping_obj kDBItem */
 
+		/** @var LanguagesItem $lang_object */
 		$lang_object = $this->Application->recallObject('lang.current');
-		/* @var $lang_object LanguagesItem */
 
 		// by weight and US/UK system - we need to store recalculated price per Kg cause shipping calculation is done per Kg!
 		if ( $shipping_obj->GetDBField('Type') == 1 && $lang_object->GetDBField('UnitSystem') == 2 ) {
@@ -280,17 +280,17 @@
 
 		$id = $event->getEventParam('id');
 
+		/** @var kDBItem $object */
 		$object = $this->Application->recallObject($event->Prefix . '.-item', $event->Prefix);
-		/* @var $object kDBItem */
 
 		$object->SwitchToTemp();
 		$object->Load($id);
 
+		/** @var kDBItem $shipping_obj */
 		$shipping_obj = $this->Application->recallObject('s');
-		/* @var $shipping_obj kDBItem */
 
+		/** @var LanguagesItem $lang_object */
 		$lang_object = $this->Application->recallObject('lang.current');
-		/* @var $lang_object LanguagesItem */
 
 		// by weight and US/UK system - we need to store recalculated price per Kg cause shipping calculation is done per Kg!
 		if ( $shipping_obj->GetDBField('Type') == 1 && $lang_object->GetDBField('UnitSystem') == 2 ) {