Index: branches/5.3.x/units/affiliate_plans_items/affiliate_plans_items_event_handler.php
===================================================================
diff -u -N -r15492 -r15695
--- branches/5.3.x/units/affiliate_plans_items/affiliate_plans_items_event_handler.php	(.../affiliate_plans_items_event_handler.php)	(revision 15492)
+++ branches/5.3.x/units/affiliate_plans_items/affiliate_plans_items_event_handler.php	(.../affiliate_plans_items_event_handler.php)	(revision 15695)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: affiliate_plans_items_event_handler.php 15149 2012-03-04 09:05:03Z alex $
+* @version	$Id: affiliate_plans_items_event_handler.php 15695 2013-02-19 11:30:36Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -65,10 +65,10 @@
 		function OnDeleteDiscountedItem($event)
 		{
 			$main_object = $event->MasterEvent->getObject();
-			$resource_id = $main_object->GetDBField('ResourceId');
+			/* @var $main_object kDBItem */
 
-			$table = $this->Application->getUnitOption($event->Prefix,'TableName');
-			$sql = 'DELETE FROM '.$table.' WHERE ItemResourceId = '.$resource_id;
+			$sql = 'DELETE FROM ' . $event->getUnitConfig()->getTableName() . '
+					WHERE ItemResourceId = ' . $main_object->GetDBField('ResourceId');
 			$this->Conn->Query($sql);
 		}
 
@@ -83,12 +83,11 @@
 		{
 			parent::OnAfterConfigRead($event);
 
-			$calculated_fields = $this->Application->getUnitOption($event->Prefix, 'CalculatedFields');
-
 			$language_id = $this->Application->GetVar('m_lang');
 			$primary_language_id = $this->Application->GetDefaultLanguageId();
 
-			$calculated_fields['']['ItemName'] = 'COALESCE(p.l' . $language_id . '_Name, p.l' . $primary_language_id . '_Name)';
-			$this->Application->setUnitOption($event->Prefix, 'CalculatedFields', $calculated_fields);
+			$event->getUnitConfig()->addCalculatedFieldsBySpecial('', Array (
+				'ItemName' => 'COALESCE(p.l' . $language_id . '_Name, p.l' . $primary_language_id . '_Name)',
+			));
 		}
 	}
\ No newline at end of file