Index: branches/5.1.x/install/upgrades.sql
===================================================================
diff -u -N -r13672 -r13745
--- branches/5.1.x/install/upgrades.sql	(.../upgrades.sql)	(revision 13672)
+++ branches/5.1.x/install/upgrades.sql	(.../upgrades.sql)	(revision 13745)
@@ -135,6 +135,12 @@
 
 # ===== v 5.0.3 =====
 
+# ===== v 5.0.4-B1 =====
+
+# ===== v 5.0.4-B2 =====
+
+# ===== v 5.0.4 =====
+
 # ===== v 5.1.0-B1 =====
 UPDATE Modules SET Path = 'modules/in-commerce/' WHERE `Name` = 'In-Commerce';
 
Index: branches/5.1.x/units/product_option_combinations/product_option_combinations_event_handler.php
===================================================================
diff -u -N -r13100 -r13745
--- branches/5.1.x/units/product_option_combinations/product_option_combinations_event_handler.php	(.../product_option_combinations_event_handler.php)	(revision 13100)
+++ branches/5.1.x/units/product_option_combinations/product_option_combinations_event_handler.php	(.../product_option_combinations_event_handler.php)	(revision 13745)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: product_option_combinations_event_handler.php 12739 2009-10-20 19:38:22Z alex $
+* @version	$Id: product_option_combinations_event_handler.php 13745 2010-06-09 17:32:28Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -101,7 +101,6 @@
 			else {
 				if( $object->Create($event->getEventParam('ForceCreateId')) )
 				{
-					if( $object->IsTempTable() ) $object->setTempID();
 					$this->customProcessing($event,'after');
 					$event->status=erSUCCESS;
 				}
Index: branches/5.1.x/units/destinations/dst_event_handler.php
===================================================================
diff -u -N -r13100 -r13745
--- branches/5.1.x/units/destinations/dst_event_handler.php	(.../dst_event_handler.php)	(revision 13100)
+++ branches/5.1.x/units/destinations/dst_event_handler.php	(.../dst_event_handler.php)	(revision 13745)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: dst_event_handler.php 12739 2009-10-20 19:38:22Z alex $
+* @version	$Id: dst_event_handler.php 13745 2010-06-09 17:32:28Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -32,16 +32,13 @@
 				$object->SetFieldsFromHash($field_values);
 				$this->customProcessing($event, 'before');
 
-				if( $object->Create() )
-				{
-					if( $object->IsTempTable() ) $object->setTempID();
+				if ( $object->Create() ) {
 					$this->customProcessing($event, 'after');
-					$event->status=erSUCCESS;
+					$event->status = erSUCCESS;
 				}
-				else
-				{
-					$event->status=erFAIL;
-					$event->redirect=false;
+				else {
+					$event->status = erFAIL;
+					$event->redirect = false;
 					$this->Application->SetVar($event->Prefix_Special.'_SaveEvent','OnCreate');
 					$object->setID(0);
 				}
@@ -106,7 +103,6 @@
 						$object->SetDBField('StdDestId', $dest_id);
 						$object->SetDBField('DestValue', $dest_value);
 						$object->Create();
-						$object->setTempID();
 					}
 
 		}
Index: branches/5.1.x/units/taxesdestinations/taxes_dst_event_handler.php
===================================================================
diff -u -N -r13100 -r13745
--- branches/5.1.x/units/taxesdestinations/taxes_dst_event_handler.php	(.../taxes_dst_event_handler.php)	(revision 13100)
+++ branches/5.1.x/units/taxesdestinations/taxes_dst_event_handler.php	(.../taxes_dst_event_handler.php)	(revision 13745)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: taxes_dst_event_handler.php 12739 2009-10-20 19:38:22Z alex $
+* @version	$Id: taxes_dst_event_handler.php 13745 2010-06-09 17:32:28Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -82,16 +82,13 @@
 				$object->SetFieldsFromHash($field_values);
 				$this->customProcessing($event,'before');
 
-				if( $object->Create() )
-				{
-					if( $object->IsTempTable() ) $object->setTempID();
+				if ( $object->Create() ) {
 					$this->customProcessing($event,'after');
-					$event->status=erSUCCESS;
+					$event->status = erSUCCESS;
 				}
-				else
-				{
-					$event->status=erFAIL;
-					$event->redirect=false;
+				else {
+					$event->status = erFAIL;
+					$event->redirect = false;
 					$this->Application->SetVar($event->Prefix_Special.'_SaveEvent','OnCreate');
 					$object->setID(0);
 				}
@@ -155,7 +152,6 @@
 						$object->SetDBField('StdDestId', $dest_id);
 						$object->SetDBField('DestValue', $dest_value);
 						$object->Create();
-						$object->setTempID();
 					}
 
 		}
Index: branches/5.1.x/units/coupon_items/coupon_items_event_handler.php
===================================================================
diff -u -N -r13100 -r13745
--- branches/5.1.x/units/coupon_items/coupon_items_event_handler.php	(.../coupon_items_event_handler.php)	(revision 13100)
+++ branches/5.1.x/units/coupon_items/coupon_items_event_handler.php	(.../coupon_items_event_handler.php)	(revision 13745)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: coupon_items_event_handler.php 12739 2009-10-20 19:38:22Z alex $
+* @version	$Id: coupon_items_event_handler.php 13745 2010-06-09 17:32:28Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -57,16 +57,13 @@
 		$object->SetDBField('ItemResourceId', -1);
 		$object->SetDBField('ItemType', 0);
 
-		if( $object->Create() )
-		{
-			if( $object->IsTempTable() ) $object->setTempID();
+		if ( $object->Create() ) {
 			$this->customProcessing($event, 'after');
-			$event->status=erSUCCESS;
+			$event->status = erSUCCESS;
 			$event->redirect_params = Array('opener' => 's'); //stay!
 		}
-		else
-		{
-			$event->status=erFAIL;
+		else {
+			$event->status = erFAIL;
 			$this->Application->SetVar($event->Prefix_Special.'_SaveEvent','OnCreate');
 			$object->setID(0);
 		}
Index: branches/5.1.x/units/discount_items/discount_items_event_handler.php
===================================================================
diff -u -N -r13100 -r13745
--- branches/5.1.x/units/discount_items/discount_items_event_handler.php	(.../discount_items_event_handler.php)	(revision 13100)
+++ branches/5.1.x/units/discount_items/discount_items_event_handler.php	(.../discount_items_event_handler.php)	(revision 13745)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: discount_items_event_handler.php 12739 2009-10-20 19:38:22Z alex $
+* @version	$Id: discount_items_event_handler.php 13745 2010-06-09 17:32:28Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -85,7 +85,6 @@
 				$object->SetDBField('ItemResourceId', $resource_id);
 				$object->SetDBField('ItemType', 1);
 				$object->Create();
-				$object->setTempID();
 			}
 		}
 		$this->finalizePopup($event);
@@ -108,16 +107,13 @@
 		$object->SetDBField('ItemResourceId', -1);
 		$object->SetDBField('ItemType', 0);
 
-		if( $object->Create() )
-		{
-			if( $object->IsTempTable() ) $object->setTempID();
+		if ( $object->Create() ) {
 			$this->customProcessing($event,'after');
-			$event->status=erSUCCESS;
+			$event->status = erSUCCESS;
 			$event->redirect_params = Array('opener' => 's'); //stay!
 		}
-		else
-		{
-			$event->status=erFAIL;
+		else {
+			$event->status = erFAIL;
 			$this->Application->SetVar($event->Prefix_Special.'_SaveEvent','OnCreate');
 			$object->setID(0);
 		}
Index: branches/5.1.x/units/shipping_costs/shipping_costs_event_handler.php
===================================================================
diff -u -N -r13100 -r13745
--- branches/5.1.x/units/shipping_costs/shipping_costs_event_handler.php	(.../shipping_costs_event_handler.php)	(revision 13100)
+++ branches/5.1.x/units/shipping_costs/shipping_costs_event_handler.php	(.../shipping_costs_event_handler.php)	(revision 13745)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: shipping_costs_event_handler.php 12739 2009-10-20 19:38:22Z alex $
+* @version	$Id: shipping_costs_event_handler.php 13745 2010-06-09 17:32:28Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -53,16 +53,13 @@
 				$object->SetFieldsFromHash($field_values);
 				$this->customProcessing($event,'before');
 
-				if( $object->Create() )
-				{
-					if ( $object->IsTempTable() ) $object->setTempID();
+				if( $object->Create() ) {
 					$this->customProcessing($event,'after');
-					$event->status=erSUCCESS;
+					$event->status = erSUCCESS;
 				}
-				else
-				{
-					$event->status=erFAIL;
-					$event->redirect=false;
+				else {
+					$event->status = erFAIL;
+					$event->redirect = false;
 					$this->Application->SetVar($event->Prefix_Special.'_SaveEvent','OnCreate');
 					$object->setID(0);
 				}
Index: branches/5.1.x/units/orders/orders_event_handler.php
===================================================================
diff -u -N -r13578 -r13745
--- branches/5.1.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 13578)
+++ branches/5.1.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 13745)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_event_handler.php 13578 2010-05-19 07:25:51Z alex $
+* @version	$Id: orders_event_handler.php 13745 2010-06-09 17:32:28Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -1030,7 +1030,9 @@
 
 		if ($event->Special == 'last') {
 			// return last order id (for using on thank you page)
-			return $this->Application->RecallVar('front_order_id');
+			$order_id = $this->Application->RecallVar('front_order_id');
+
+			return $order_id > 0 ? $order_id : FAKE_ORDER_ID; // FAKE_ORDER_ID helps to keep parent filter for order items set in "kDBList::linkToParent"
 		}
 
 		$ses_id = $this->Application->RecallVar( $event->getPrefixSpecial(true) . '_id' );
@@ -1093,7 +1095,7 @@
 
 		$object->SetDBField('Number', $this->getNextOrderNumber($event));
 		$object->SetDBField('SubNumber', 0);
-		$object->SetDBField('Type', ORDER_STATUS_INCOMPLETE);
+		$object->SetDBField('Status', ORDER_STATUS_INCOMPLETE);
 		$object->SetDBField('VisitId', $this->Application->RecallVar('visit_id') );
 
 		// get user
@@ -2644,7 +2646,6 @@
 			$item_data = $passed_item_data;
 			$object->SetDBField('ItemData', serialize($item_data));
 			$object->Create();
-			if( $this->UseTempTables($event) ) $object->SetTempId();
 		}
 		else {
 			return false; // item requiring to set qty to 0, meaning already does not exist
@@ -2794,9 +2795,6 @@
 		}
 		else {
 			$object->Create();
-			if ($this->UseTempTables($event)) {
-				$object->setTempID();
-			}
 		}
 
 		$this->Application->HandleEvent($ord_event, 'ord:OnRecalculateItems');
Index: branches/5.1.x/units/products/products_event_handler.php
===================================================================
diff -u -N -r13578 -r13745
--- branches/5.1.x/units/products/products_event_handler.php	(.../products_event_handler.php)	(revision 13578)
+++ branches/5.1.x/units/products/products_event_handler.php	(.../products_event_handler.php)	(revision 13745)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: products_event_handler.php 13578 2010-05-19 07:25:51Z alex $
+* @version	$Id: products_event_handler.php 13745 2010-06-09 17:32:28Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -748,7 +748,7 @@
 
 		if (!getArrayValue($item_data,'PortalGroupId')) {
 			// is subscription product, but no group defined in it's properties
-			trigger_error('Invalid product <b>'.$field_values['ProductName'].'</b> (id: '.$field_values['ProductId'].')');
+			trigger_error('Invalid product <b>'.$field_values['ProductName'].'</b> (id: '.$field_values['ProductId'].')', E_USER_WARNING);
 			return false;
 		}
 
@@ -904,9 +904,9 @@
 		$has_required = $this->Conn->GetOne('SELECT COUNT(*) FROM '.$opt_object->TableName.' WHERE Required = 1 AND ProductId = '.$object->GetDBField('ProductId'));
 		//we need to imitate data sumbit, as parent' PreSave sets object values from $items_info
 		$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
-		$items_info[$object->GetDBField('ProductId')]['HasRequiredOptions'] = $has_required ? 1:0;
+		$items_info[$object->GetDBField('ProductId')]['HasRequiredOptions'] = $has_required ? '1' : '0';
 		$this->Application->SetVar($event->getPrefixSpecial(true), $items_info);
-		$object->SetDBField('HasRequiredOptions', $has_required ? 1:0);
+		$object->SetDBField('HasRequiredOptions', $has_required ? 1 : 0);
 	}
 
 	/**
@@ -944,11 +944,8 @@
 			$field_values = Array('ProductId' => $product_id, 'IsPrimary' => 1, 'MinQty' => 1, 'MaxQty' => -1, 'GroupId'=>$group_id);
 			$pr_object->SetDBFieldsFromHash($field_values);
 			$pr_object->SetField('Price', $price);
-			$ret = $pr_object->Create();
-			if ($pr_object->mode == 't') {
-				$pr_object->setTempID();
-			}
-			return $ret;
+
+			return $pr_object->Create();
 		}
 	}
 
Index: branches/5.1.x/admin_templates/affiliate_plans/affiliate_plans_brackets.tpl
===================================================================
diff -u -N -r13100 -r13745
--- branches/5.1.x/admin_templates/affiliate_plans/affiliate_plans_brackets.tpl	(.../affiliate_plans_brackets.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/affiliate_plans/affiliate_plans_brackets.tpl	(.../affiliate_plans_brackets.tpl)	(revision 13745)
@@ -35,19 +35,19 @@
 	  			{
 	  				submit_event('apbrackets', 'OnMoreBrackets')
 	  			}
-				a_toolbar.AddButton( new ToolBarButton('more_brackets', '<inp2:m_phrase label="la_ToolTip_MoreBrackets" escape="1"/>', add_brackets) );
+				a_toolbar.AddButton( new ToolBarButton('in-commerce:more_brackets', '<inp2:m_phrase label="la_ToolTip_MoreBrackets" escape="1"/>', add_brackets) );
 
 				function infinity()
 	  			{
 					submit_event('apbrackets', 'OnInfinity');
 	  			}
-				a_toolbar.AddButton( new ToolBarButton('infinity', '<inp2:m_phrase label="la_ToolTip_Infinity" escape="1"/>', infinity) );
+				a_toolbar.AddButton( new ToolBarButton('in-commerce:infinity', '<inp2:m_phrase label="la_ToolTip_Infinity" escape="1"/>', infinity) );
 
 				function arrange_brackets()
 	  			{
 					submit_event('apbrackets', 'OnArrange')
 	  			}
-				a_toolbar.AddButton( new ToolBarButton('arrange', '<inp2:m_phrase label="la_ToolTip_Arrange" escape="1"/>', arrange_brackets) );
+				a_toolbar.AddButton( new ToolBarButton('in-commerce:arrange', '<inp2:m_phrase label="la_ToolTip_Arrange" escape="1"/>', arrange_brackets) );
 
 				a_toolbar.Render();
 
Index: branches/5.1.x/units/order_items/order_items_tag_processor.php
===================================================================
diff -u -N -r13100 -r13745
--- branches/5.1.x/units/order_items/order_items_tag_processor.php	(.../order_items_tag_processor.php)	(revision 13100)
+++ branches/5.1.x/units/order_items/order_items_tag_processor.php	(.../order_items_tag_processor.php)	(revision 13745)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: order_items_tag_processor.php 12739 2009-10-20 19:38:22Z alex $
+* @version	$Id: order_items_tag_processor.php 13745 2010-06-09 17:32:28Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -212,11 +212,13 @@
 		$product_object =& $this->Application->recallObject('p', 'p', Array('skip_autoload' => true));
 		/* @var $product_object kCatDBItem */
 
-		$product_id = $product_object->GetID();
+		$product_id = $product_object->GetID();		
+		$product_id_get = $this->Application->GetVar('p_id');
 
 		while (!$list->EOL()) {
 			// load product used in orderitem
 			$this->Application->SetVar( $this->getPrefixSpecial().'_id', $list->GetDBField($id_field) ); // for edit/delete links using GET
+			$this->Application->SetVar('p_id', $list->GetDBField('ProductId'));
 			$product_object->Load( $list->GetDBField('ProductId') );	// correct product load
 
 			$this->Application->SetVar('m_cat_id', $product_object->GetDBField('CategoryId'));
@@ -226,6 +228,7 @@
 		}
 
 		// restore IDs used in cycle
+		$this->Application->SetVar('p_id', $product_id_get);
 		$this->Application->DeleteVar($this->getPrefixSpecial().'_id');
 		$product_object->Load($product_id);
 
Index: branches/5.1.x/units/orders/orders_tag_processor.php
===================================================================
diff -u -N -r13578 -r13745
--- branches/5.1.x/units/orders/orders_tag_processor.php	(.../orders_tag_processor.php)	(revision 13578)
+++ branches/5.1.x/units/orders/orders_tag_processor.php	(.../orders_tag_processor.php)	(revision 13745)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_tag_processor.php 13578 2010-05-19 07:25:51Z alex $
+* @version	$Id: orders_tag_processor.php 13745 2010-06-09 17:32:28Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -169,7 +169,7 @@
 		function ItemsInCart($params)
 		{
 			$object =& $this->getObject($params);
-			if ($object->GetDBField('Status') != ORDER_STATUS_INCOMPLETE) {
+			if ($object->GetDBField('Status') != ORDER_STATUS_INCOMPLETE || $object->GetID() == FAKE_ORDER_ID) {
 				return 0;
 			}
 
@@ -183,7 +183,7 @@
 		{
 			$object =& $this->getObject($params);
 
-			if ($object->GetDBField('Status') != ORDER_STATUS_INCOMPLETE) {
+			if ($object->GetDBField('Status') != ORDER_STATUS_INCOMPLETE || $object->GetID() == FAKE_ORDER_ID) {
 				return 0;
 			}
 
Index: branches/5.1.x/units/pricing/pricing_event_handler.php
===================================================================
diff -u -N -r13110 -r13745
--- branches/5.1.x/units/pricing/pricing_event_handler.php	(.../pricing_event_handler.php)	(revision 13110)
+++ branches/5.1.x/units/pricing/pricing_event_handler.php	(.../pricing_event_handler.php)	(revision 13745)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: pricing_event_handler.php 13110 2010-01-13 18:59:27Z alex $
+* @version	$Id: pricing_event_handler.php 13745 2010-06-09 17:32:28Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -207,7 +207,6 @@
 
 					if( $object->Create() )
 					{
-						$object->setTempID();
 						$event->status=erSUCCESS;
 					}
 				}
Index: branches/5.1.x/units/products/products_config.php
===================================================================
diff -u -N -r13632 -r13745
--- branches/5.1.x/units/products/products_config.php	(.../products_config.php)	(revision 13632)
+++ branches/5.1.x/units/products/products_config.php	(.../products_config.php)	(revision 13745)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: products_config.php 13632 2010-05-25 09:24:40Z alex $
+* @version	$Id: products_config.php 13745 2010-06-09 17:32:28Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -389,7 +389,8 @@
 							'CategoryId'	=> TABLE_PREFIX.'%3$sCategoryItems.CategoryId',
 							'ParentPath'	=> TABLE_PREFIX.'Category.ParentPath',
 							'Manufacturer'	=> TABLE_PREFIX.'Manufacturers.Name',
-							'Filename' => TABLE_PREFIX.'%3$sCategoryItems.Filename',
+							'Filename'		=> TABLE_PREFIX.'%3$sCategoryItems.Filename',
+							'CategoryFilename' => TABLE_PREFIX.'Category.NamedParentPath',
 							'FileSize'		=>	'files.Size',
 							'FilePath'		=>	'files.FilePath',
 							'FileVersion'	=>	'files.Version',
@@ -404,25 +405,28 @@
 							'FilePath'		=>	'files.FilePath',
 							'FileVersion'	=>	'files.Version',
 							'Filename' 		=>	TABLE_PREFIX.'%3$sCategoryItems.Filename',
+							'CategoryFilename' => TABLE_PREFIX.'Category.NamedParentPath',
 						),
 					),
 
+					'CacheModRewrite' => true,
+
 					'ListSQLs'			=>	Array (
 													''	=>	'	SELECT %1$s.* %2$s
 																FROM %1$s
 																LEFT JOIN '.TABLE_PREFIX.'PortalGroup ON '.TABLE_PREFIX.'PortalGroup.GroupId = %1$s.AccessGroupId
 																LEFT JOIN '.TABLE_PREFIX.'%3$sCategoryItems ON '.TABLE_PREFIX.'%3$sCategoryItems.ItemResourceId = %1$s.ResourceId
 																LEFT JOIN '.TABLE_PREFIX.'Category ON '.TABLE_PREFIX.'Category.CategoryId = '.TABLE_PREFIX.'%3$sCategoryItems.CategoryId
-																LEFT JOIN '.TABLE_PREFIX.'Images img ON img.ResourceId = %1$s.ResourceId AND img.DefaultImg = 1
-																LEFT JOIN '.TABLE_PREFIX.'ProductFiles files ON files.ProductId = %1$s.ProductId AND files.IsPrimary = 1
-																LEFT JOIN '.TABLE_PREFIX.'ProductsPricing pricing ON pricing.ProductId = %1$s.ProductId AND pricing.IsPrimary = 1
+																LEFT JOIN '.TABLE_PREFIX.'%3$sImages img ON img.ResourceId = %1$s.ResourceId AND img.DefaultImg = 1
+																LEFT JOIN '.TABLE_PREFIX.'%3$sProductFiles files ON files.ProductId = %1$s.ProductId AND files.IsPrimary = 1
+																LEFT JOIN '.TABLE_PREFIX.'%3$sProductsPricing pricing ON pricing.ProductId = %1$s.ProductId AND pricing.IsPrimary = 1
 																LEFT JOIN '.TABLE_PREFIX.'Manufacturers ON '.TABLE_PREFIX.'Manufacturers.ManufacturerId = %1$s.ManufacturerId
 																LEFT JOIN '.TABLE_PREFIX.'PermCache perm ON perm.CategoryId = '.TABLE_PREFIX.'%3$sCategoryItems.CategoryId
 																LEFT JOIN '.TABLE_PREFIX.'%3$sProductsCustomData cust ON %1$s.ResourceId = cust.ResourceId',
 
 													'showall' => 'SELECT %1$s.* %2$s FROM %1$s
-																LEFT JOIN '.TABLE_PREFIX.'ProductsPricing pricing ON pricing.ProductId = %1$s.ProductId AND pricing.IsPrimary = 1
-																LEFT JOIN '.TABLE_PREFIX.'ProductFiles files ON files.ProductId = %1$s.ProductId AND files.IsPrimary = 1
+																LEFT JOIN '.TABLE_PREFIX.'%3$sProductsPricing pricing ON pricing.ProductId = %1$s.ProductId AND pricing.IsPrimary = 1
+																LEFT JOIN '.TABLE_PREFIX.'%3$sProductFiles files ON files.ProductId = %1$s.ProductId AND files.IsPrimary = 1
 																LEFT JOIN '.TABLE_PREFIX.'Manufacturers ON '.TABLE_PREFIX.'Manufacturers.ManufacturerId = %1$s.ManufacturerId
 																LEFT JOIN '.TABLE_PREFIX.'%3$sCategoryItems ON '.TABLE_PREFIX.'%3$sCategoryItems.ItemResourceId = %1$s.ResourceId
 																LEFT JOIN '.TABLE_PREFIX.'Category ON '.TABLE_PREFIX.'Category.CategoryId = '.TABLE_PREFIX.'%3$sCategoryItems.CategoryId
@@ -440,9 +444,9 @@
 															LEFT JOIN '.TABLE_PREFIX.'PortalGroup pg ON pg.GroupId = %1$s.AccessGroupId
 															LEFT JOIN '.TABLE_PREFIX.'%3$sCategoryItems ON '.TABLE_PREFIX.'%3$sCategoryItems.ItemResourceId = %1$s.ResourceId
 															LEFT JOIN '.TABLE_PREFIX.'Category ON '.TABLE_PREFIX.'Category.CategoryId = '.TABLE_PREFIX.'%3$sCategoryItems.CategoryId
-															LEFT JOIN '.TABLE_PREFIX.'Images img ON img.ResourceId = %1$s.ResourceId AND img.DefaultImg = 1
-															LEFT JOIN '.TABLE_PREFIX.'ProductFiles files ON files.ProductId = %1$s.ProductId AND files.IsPrimary = 1
-															LEFT JOIN '.TABLE_PREFIX.'ProductsPricing pricing ON pricing.ProductId = %1$s.ProductId AND pricing.IsPrimary = 1
+															LEFT JOIN '.TABLE_PREFIX.'%3$sImages img ON img.ResourceId = %1$s.ResourceId AND img.DefaultImg = 1
+															LEFT JOIN '.TABLE_PREFIX.'%3$sProductFiles files ON files.ProductId = %1$s.ProductId AND files.IsPrimary = 1
+															LEFT JOIN '.TABLE_PREFIX.'%3$sProductsPricing pricing ON pricing.ProductId = %1$s.ProductId AND pricing.IsPrimary = 1
 															LEFT JOIN '.TABLE_PREFIX.'Manufacturers ON '.TABLE_PREFIX.'Manufacturers.ManufacturerId = %1$s.ManufacturerId
 															LEFT JOIN '.TABLE_PREFIX.'%3$sProductsCustomData cust ON %1$s.ResourceId = cust.ResourceId',
 																		),
Index: branches/5.1.x/admin_templates/products/products_pricing.tpl
===================================================================
diff -u -N -r13100 -r13745
--- branches/5.1.x/admin_templates/products/products_pricing.tpl	(.../products_pricing.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/products/products_pricing.tpl	(.../products_pricing.tpl)	(revision 13745)
@@ -13,24 +13,19 @@
   		<script type="text/javascript">
   				Request.progressText = '<inp2:m_phrase name="la_title_Loading" escape="1"/>';
 
-				var defaultGroup = <inp2:conf_ConfigValue name="User_LoggedInGroup"/>;
-
 				Catalog.prototype.AfterInit = function () {
-					Grids['g'].SelectDefault(defaultGroup);
+					var $default_group = <inp2:conf_ConfigValue name="User_LoggedInGroup"/>;
+
+					set_hidden_field('group_id', $default_group);
+					$('#current_group_id').val($default_group).change();
 				}
 
 				Catalog.prototype.go_to_group = function($group_id) {
-					if (!isset($group_id)) {
-						$group_id = 0; // gets current group
-					}
-					else {
-						set_hidden_field('current_group_id', $group_id);
-					}
 					this.refreshTab('pr.tang', 'pr.tang_div');
 				}
 
   				Catalog.prototype.refreshTab = function($prefix, $div_id, $force) {
-					var $group_id = get_hidden_field('current_group_id');
+					var $group_id = $('#current_group_id').val();
 					var $tab_group_id = document.getElementById($div_id).getAttribute('group_id');
 					if ($group_id != $tab_group_id || $force) {
 						// query tab content only in case if not queried or category don't match
@@ -183,37 +178,58 @@
 
 <inp2:pr.tang_SaveWarning name="grid_save_warning"/>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="g" IdField="GroupId" per_page="-1" grid="Radio" header_block="grid_column_title_no_sorting" grid_height="220" grid_status="0"/>
+<div id="scroll_container" mode="minimal">
+	<table class="edit-form" style="border-bottom: 1px solid black;">
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
+			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
+				<td class="label-cell">
+					<inp2:m_Phrase name="la_fld_Group"/>:
+				</td>
+				<td class="control-mid">&nbsp;</td>
+				<td class="control-cell">
+					<select name="current_group_id" id="current_group_id">
+						<inp2:m_DefineElement name="group_element">
+							<option value="<inp2:Field name='GroupId'/>"><inp2:Field name="Name"/></option>
+						</inp2:m_DefineElement>
 
+						<inp2:g_PrintList render_as="group_element" per_page="-1"/>
+					</select>
+				</td>
+			</tr>
+
+			<inp2:m_RenderElement name="inp_edit_filler"/>
+	</table>
+</div>
+
 <inp2:m_include t="in-commerce/products/products_pricing_grid" tab_init="1" item_prefix="pr.tang"/>
 
 <inp2:m_include t="incs/footer"/>
 
 <script type="text/javascript">
-	Grids['g'].OnSelect = function ($id) {
-		set_hidden_field('group_id', $id);
-		$BracketManager.go_to_group($id);
+	var $last_group_id = false;
 
-	}
+	$(document).ready(
+		function() {
+			$('#current_group_id').change(
+				function ($e) {
+					var $group_id = $(this).val();
 
-	Grids['g'].OnUnSelect = function ($id) {
-		set_hidden_field('group_id', $id);
-		set_hidden_field('item_prefix', $BracketManager.ActivePrefix);
-		$BracketManager.submit_event('pr.tang', 'OnArrange', 'in-commerce/products/products_pricing_grid', false);
+					if ($last_group_id !== false) {
+						// save pricings from previous selected group
+						set_hidden_field('group_id', $last_group_id);
+						set_hidden_field('item_prefix', $BracketManager.ActivePrefix);
+						$BracketManager.submit_event('pr.tang', 'OnArrange', 'in-commerce/products/products_pricing_grid', false);
+					}
 
-	}
+					// get prices from new group
+					set_hidden_field('group_id', $group_id);
+					$BracketManager.go_to_group($group_id);
 
-	Grids['g'].SelectDefault = function (group_id) {
-		for (var $i in this.Items) {
-			if (this.Items[$i].ItemId == group_id){
-				this.Items[$i].Select();
-				break;
-			}
-		}
-	}
+					// remember previous selected group
+					$last_group_id = $group_id;
+				}
+			);
 
-	$(document).ready(
-		function() {
 			$BracketManager.Init(false);
 		}
 	);
Index: branches/5.1.x/units/affiliate_plans_items/affiliate_plans_items_event_handler.php
===================================================================
diff -u -N -r13100 -r13745
--- branches/5.1.x/units/affiliate_plans_items/affiliate_plans_items_event_handler.php	(.../affiliate_plans_items_event_handler.php)	(revision 13100)
+++ branches/5.1.x/units/affiliate_plans_items/affiliate_plans_items_event_handler.php	(.../affiliate_plans_items_event_handler.php)	(revision 13745)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: affiliate_plans_items_event_handler.php 12739 2009-10-20 19:38:22Z alex $
+* @version	$Id: affiliate_plans_items_event_handler.php 13745 2010-06-09 17:32:28Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -45,16 +45,13 @@
 			$object->SetDBField('ItemResourceId', -1);
 			$object->SetDBField('ItemType', 0);
 
-			if( $object->Create() )
-			{
-				if( $object->IsTempTable() ) $object->setTempID();
+			if ( $object->Create() ) {
 				$this->customProcessing($event, 'after');
-				$event->status=erSUCCESS;
+				$event->status = erSUCCESS;
 				$event->redirect_params = Array('opener' => 's'); //stay!
 			}
-			else
-			{
-				$event->status=erFAIL;
+			else {
+				$event->status = erFAIL;
 				$this->Application->SetVar($event->Prefix_Special.'_SaveEvent','OnCreate');
 				$object->setID(0);
 			}
Index: branches/5.1.x/admin_templates/orders/orders_edit.tpl
===================================================================
diff -u -N -r13100 -r13745
--- branches/5.1.x/admin_templates/orders/orders_edit.tpl	(.../orders_edit.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/orders/orders_edit.tpl	(.../orders_edit.tpl)	(revision 13745)
@@ -105,7 +105,7 @@
 					<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
 						<inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord" field="Number" title="!la_fld_OrderNumber!"/>
 						<td class="control-cell">
-							<inp2:ord_Field field="Number"/>-<inp2:ord_Field field="SubNumber"/>
+							<inp2:ord_Field field="OrderNumber"/>
 						</td>
 						<inp2:m_RenderElement name="inp_edit_error" prefix="ord" field="OrderNumber"/>
 					</tr>
Index: branches/5.1.x/units/payment_type_currencies/payment_type_currencies_event_handler.php
===================================================================
diff -u -N -r13100 -r13745
--- branches/5.1.x/units/payment_type_currencies/payment_type_currencies_event_handler.php	(.../payment_type_currencies_event_handler.php)	(revision 13100)
+++ branches/5.1.x/units/payment_type_currencies/payment_type_currencies_event_handler.php	(.../payment_type_currencies_event_handler.php)	(revision 13745)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: payment_type_currencies_event_handler.php 12739 2009-10-20 19:38:22Z alex $
+* @version	$Id: payment_type_currencies_event_handler.php 13745 2010-06-09 17:32:28Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -45,10 +45,6 @@
 				$this->customProcessing($event, 'before');
 
 				if ( $object->Create() ) {
-					if ( $object->IsTempTable() ) {
-						$object->setTempID();
-					}
-
 					$this->customProcessing($event, 'after');
 					$event->status = erSUCCESS;
 				}