Index: branches/5.1.x/units/manufacturers/manufacturers_event_handler.php
===================================================================
diff -u -N -r13100 -r13465
--- branches/5.1.x/units/manufacturers/manufacturers_event_handler.php	(.../manufacturers_event_handler.php)	(revision 13100)
+++ branches/5.1.x/units/manufacturers/manufacturers_event_handler.php	(.../manufacturers_event_handler.php)	(revision 13465)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: manufacturers_event_handler.php 12739 2009-10-20 19:38:22Z alex $
+* @version	$Id: manufacturers_event_handler.php 13465 2010-04-28 15:08:00Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -79,38 +79,45 @@
 	 * @param kEvent $event
 	 * @access public
 	 */
-	function OnPrepareStates(&$event)
+	function OnAfterItemLoad(&$event)
 	{
-		$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
-		$cs_helper->PopulateStates($event, 'State', 'Country');
+		parent::OnAfterItemLoad($event);
 
-		$object =& $event->getObject();
-
-		if( $object->isRequired('Country') && $cs_helper->CountryHasStates( $object->GetDBField('Country') ) ) $object->setRequired('State', true);
-	}
-
-	function OnUpdate(&$event)
-	{
 		$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
-		$cs_helper->CheckStateField($event, 'State', 'Country');
+		/* @var $cs_helper kCountryStatesHelper */
 
-		parent::OnUpdate($event);
+		$cs_helper->PopulateStates($event, 'State', 'Country');
 	}
 
-	function OnCreate(&$event)
+	/**
+	 * Processes states
+	 *
+	 * @param kEvent $event
+	 */
+	function OnBeforeItemUpdate(&$event)
 	{
+		parent::OnBeforeItemUpdate($event);
+
 		$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
-		$cs_helper->CheckStateField($event, 'State', 'Country');
+		/* @var $cs_helper kCountryStatesHelper */
 
-		parent::OnCreate($event);
+		$cs_helper->CheckStateField($event, 'State', 'Country');
+		$cs_helper->PopulateStates($event, 'State', 'Country');
 	}
 
-	function OnPreSave(&$event)
+	/**
+	 * Processes states
+	 *
+	 * @param kEvent $event
+	 */
+	function OnBeforeItemCreate(&$event)
 	{
+		parent::OnBeforeItemCreate($event);
+
 		$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
-		$cs_helper->CheckStateField($event, 'State', 'Country');
+		/* @var $cs_helper kCountryStatesHelper */
 
-		parent::OnPreSave($event);
+		$cs_helper->CheckStateField($event, 'State', 'Country');
+		$cs_helper->PopulateStates($event, 'State', 'Country');
 	}
-
 }
\ No newline at end of file