Index: branches/5.1.x/units/zones/zones_config.php
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/units/zones/zones_config.php	(.../zones_config.php)	(revision 14257)
+++ branches/5.1.x/units/zones/zones_config.php	(.../zones_config.php)	(revision 14534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: zones_config.php 14257 2011-03-16 21:41:19Z alex $
+* @version	$Id: zones_config.php 14534 2011-09-18 14:13:17Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -32,8 +32,8 @@
 					'TitlePresets'		=>	Array (
 						'default' => Array (
 							'new_status_labels' => Array ('z' => '!la_title_AddingShippingZone!'),
-							'edit_status_labels' => Array ('z' => '!la_title_EditingShippingZone!'),							
-						),		
+							'edit_status_labels' => Array ('z' => '!la_title_EditingShippingZone!'),
+						),
 												'zones_edit'		=>	Array (	'prefixes' => Array ('z'), 'format' => "#z_status# - '#z_titlefield#'"),
 					),
 					'TableName'			=>	TABLE_PREFIX . 'ShippingZones',
@@ -59,7 +59,7 @@
 			            'ShippingTypeID' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, ),
 			            'Name' => Array (
 			            	'type' => 'string', 'max_len' => 100,
-							'required' => 1, 'default' => '', 'not_null' => 1, 								
+							'required' => 1, 'default' => '', 'not_null' => 1,
 							'error_msgs' => Array ('required' => 'Please fill in'),
 						),
 			            'Type' => Array (
@@ -69,7 +69,7 @@
 								1 => 'la_ByCountry',
 								2 => 'la_ByState',
 								3 => 'la_ByZIP'
-							), 
+							),
 							'not_null' => 1, 'default' => 1,
 						),
 			            'CODallowed' => Array (
@@ -89,10 +89,10 @@
 								'module' => 'core',
 							),
 							'Fields' => Array (
-								'ZoneID' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
-								'Name' => Array ( 'title' => 'la_col_ShipZoneName', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
-								'Type' => Array ( 'title' => 'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
-								'CODallowed' => Array ( 'title' => 'la_col_CODallowed', 'filter_block' => 'grid_options_filter', 'width' => 120, )
+								'ZoneID' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+								'Name' => Array ( 'title' => 'column:la_fld_ShipZoneName', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
+								'Type' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+								'CODallowed' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 120, )
 							),
 						),
 					),
Index: branches/5.1.x/units/reports/reports_event_handler.php
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/units/reports/reports_event_handler.php	(.../reports_event_handler.php)	(revision 14257)
+++ branches/5.1.x/units/reports/reports_event_handler.php	(.../reports_event_handler.php)	(revision 14534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: reports_event_handler.php 14257 2011-03-16 21:41:19Z alex $
+* @version	$Id: reports_event_handler.php 14534 2011-09-18 14:13:17Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -372,10 +372,10 @@
 				),
 				'Fields' => Array (
 					'CategoryName' => Array ('title' => 'la_col_CategoryName', 'filter_block' => 'grid_like_filter'),
-					'Qty' => Array ('title' => 'la_col_Qty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+					'Qty' => Array ('td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 					'StoreQty' => Array ('title' => 'la_col_StoreQty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 					'eBayQty' => Array ('title' => 'la_col_eBayQty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
-					'Cost' => Array ('title' => 'la_col_Cost', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_float_range_filter'),
+					'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_float_range_filter'),
 					'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
 					'StoreAmount' => Array ('title' => 'la_col_StoreGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
 					'eBayAmount' => Array ('title' => 'la_col_eBayGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
@@ -436,11 +436,11 @@
 								'module' => 'core',
 							),
 				'Fields' => Array (
-					'Login' => Array ('title' => 'la_col_Login', 'filter_block' => 'grid_like_filter'),
-					'FirstName' => Array ('title' => 'la_col_FirstName', 'filter_block' => 'grid_like_filter'),
-					'LastName' => Array ('title' => 'la_col_LastName', 'filter_block' => 'grid_like_filter'),
-					'Qty' => Array ('title' => 'la_col_Qty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
-					'Cost' => Array ('title' => 'la_col_Cost', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
+					'Login' => Array ('filter_block' => 'grid_like_filter'),
+					'FirstName' => Array ('filter_block' => 'grid_like_filter'),
+					'LastName' => Array ('filter_block' => 'grid_like_filter'),
+					'Qty' => Array ('td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+					'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
 					'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
 					'Tax' => Array ('title' => 'la_col_Tax', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
 					'Shipping' => Array ('title' => 'la_col_Shipping', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
@@ -475,10 +475,10 @@
 					),
 				'Fields' => Array (
 					'ProductName' => Array ('title' => 'la_col_ProductName', 'filter_block' => 'grid_like_filter'),
-					'Qty' => Array ('title' => 'la_col_Qty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+					'Qty' => Array ('td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 					'StoreQty' => Array ('title' => 'la_col_StoreQty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
 					'eBayQty' => Array ('title' => 'la_col_eBayQty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
-					'Cost' => Array ('title' => 'la_col_Cost', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_float_range_filter'),
+					'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_float_range_filter'),
 					'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
 					'StoreAmount' => Array ('title' => 'la_col_StoreGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
 					'eBayAmount' => Array ('title' => 'la_col_eBayGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
@@ -543,8 +543,8 @@
 				),
 				'Fields' => Array(
 					'Marketplace' => Array ('title' => 'la_col_Marketplace', 'filter_block' => 'grid_options_filter'),
-					'Qty' => Array ('title' => 'la_col_Qty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
-					'Cost' => Array ('title' => 'la_col_Cost', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
+					'Qty' => Array ('td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'),
+					'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
 					'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
 					'Tax' => Array ('title' => 'la_col_Tax', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
 					'Shipping' => Array ('title' => 'la_col_Shipping', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),
Index: branches/5.1.x/units/pricing/pricing_config.php
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/units/pricing/pricing_config.php	(.../pricing_config.php)	(revision 14257)
+++ branches/5.1.x/units/pricing/pricing_config.php	(.../pricing_config.php)	(revision 14534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: pricing_config.php 14257 2011-03-16 21:41:19Z alex $
+* @version	$Id: pricing_config.php 14534 2011-09-18 14:13:17Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -102,7 +102,7 @@
 							'not_null' => 1, 'default' => 0,
 						),
 					    'GroupId' => Array ('type' => 'int', 'default' => 0, 'not_null' => 1),
-						
+
 						/* TODO implement these fields in business logic
 						'AccessRebillDate' => Array (
 							'type'=> 'int', 'min_value' => 0, 'max_value' => 31, 'not_null'=> '1', 'default' => 0,
@@ -123,30 +123,13 @@
 													),
 
 					'Grids'	=> Array (
-					/*
-								'Default'		=>	Array (
-																	'Icons' => Array (
-																		'default' => 'icon16_item.png',
-																		'module' => 'core',
-																	),
-																	'Fields' => Array (
-																			'MinQty' => Array ( 'title'=> 'la_col_MinQty', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
-																			'MaxQty' => Array ( 'title'=> 'la_col_MaxQty', 'filter_block' => 'grid_range_filter'),
-																			'Price' => Array ( 'title'=> 'la_col_Price', 'filter_block' => 'grid_range_filter'),
-																			'Points' => Array ( 'title'=> 'la_col_Points', 'filter_block' => 'grid_range_filter'),
-																			'Cost' => Array ( 'title'=> 'la_col_Cost', 'filter_block' => 'grid_range_filter'),
-																			'Negotiated' => Array ( 'title'=> 'la_col_Negotiated', 'data_block' => 'negotiated_td', 'filter_block' => 'grid_options_filter'),
-																			),
-
-																),
-					*/
 								'Access'		=>	Array (
 																	'Icons' => Array ('default'=> 'icon16_pricing.gif', '0'=> 'icon16_pricing.gif', '1'=> 'icon16_pricing_primary.gif'),
 																	'Fields' => Array (
-																			'AccessDuration' => Array ( 'title'=> 'la_col_AccessDuration', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
-																			'AccessUnit' => Array ( 'title'=> 'la_col_AccessDurationUnit', 'filter_block' => 'grid_options_filter'),
-																			'Description' => Array ( 'title'=> 'la_col_Description', 'filter_block' => 'grid_like_filter'),
-																			'Price' => Array ( 'title'=> 'la_col_Price', 'filter_block' => 'grid_float_range_filter'),
+																			'AccessDuration' => Array ('data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
+																			'AccessUnit' => Array ( 'title'=> 'column:la_fld_AccessDurationUnit', 'filter_block' => 'grid_options_filter'),
+																			'Description' => Array ('filter_block' => 'grid_like_filter'),
+																			'Price' => Array ( 'filter_block' => 'grid_float_range_filter'),
 																			),
 
 																),
Index: branches/5.1.x/admin_templates/affiliate_plans/affiliate_plans_brackets.tpl
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/admin_templates/affiliate_plans/affiliate_plans_brackets.tpl	(.../affiliate_plans_brackets.tpl)	(revision 14257)
+++ branches/5.1.x/admin_templates/affiliate_plans/affiliate_plans_brackets.tpl	(.../affiliate_plans_brackets.tpl)	(revision 14534)
@@ -162,8 +162,8 @@
 <inp2:apbrackets_SaveWarning name="grid_save_warning"/>
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
 	<tr nowrap="nowrap" class="grid-header-row-0">
-		<inp2:m_RenderElement name="pr_grid_th" phrase="la_col_FromAmount"/>
-		<inp2:m_RenderElement name="pr_grid_th" phrase="la_col_ToAmount"/>
+		<inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_FromAmount"/>
+		<inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_ToAmount"/>
 		<inp2:m_RenderElement name="pr_grid_th" phrase="la_col_Percent"/>
 	</tr>
 	<inp2:apbrackets_ShowPricingForm block="prbracket" IdField="AffiliateBracketId"/>
Index: branches/5.1.x/units/addresses/addresses_config.php
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/units/addresses/addresses_config.php	(.../addresses_config.php)	(revision 14257)
+++ branches/5.1.x/units/addresses/addresses_config.php	(.../addresses_config.php)	(revision 14534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: addresses_config.php 14257 2011-03-16 21:41:19Z alex $
+* @version	$Id: addresses_config.php 14534 2011-09-18 14:13:17Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -113,6 +113,4 @@
 												'ShortAddress' => Array('type'=>'string', 'default' => ''),
 										),
 
-					'Grids'	=> Array(),
-
 	);
\ No newline at end of file
Index: branches/5.1.x/units/manufacturers/manufacturers_config.php
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/units/manufacturers/manufacturers_config.php	(.../manufacturers_config.php)	(revision 14257)
+++ branches/5.1.x/units/manufacturers/manufacturers_config.php	(.../manufacturers_config.php)	(revision 14534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: manufacturers_config.php 14257 2011-03-16 21:41:19Z alex $
+* @version	$Id: manufacturers_config.php 14534 2011-09-18 14:13:17Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -35,7 +35,7 @@
 					'TitlePresets' => Array (
 						'default' => Array (
 							'new_status_labels' => Array ('manuf' => '!la_title_AddingManufacturer!'),
-							'edit_status_labels' => Array ('manuf' => '!la_title_EditingManufacturer!'),																		
+							'edit_status_labels' => Array ('manuf' => '!la_title_EditingManufacturer!'),
 						),
 						'manuf_list' => Array (
 							'prefixes' => Array ('manuf_List'), 'format' => "!la_title_Manufacturers!",
@@ -120,10 +120,10 @@
 								'module' => 'core',
 							),
 							'Fields' => Array (
-								'ManufacturerId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+								'ManufacturerId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
 								'Name' => Array ('title' => 'la_col_ManufacturerName', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
 								'IsPopular' => Array ('title' => 'la_col_IsPopular', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
-								'URL' => Array ('title' => 'la_col_URL', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
+								'URL' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
 							),
 						),
 					),
Index: branches/5.1.x/admin_templates/products/products_pricing_grid.tpl
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/admin_templates/products/products_pricing_grid.tpl	(.../products_pricing_grid.tpl)	(revision 14257)
+++ branches/5.1.x/admin_templates/products/products_pricing_grid.tpl	(.../products_pricing_grid.tpl)	(revision 14534)
@@ -89,17 +89,17 @@
 
 	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
 		<tr nowrap="nowrap" class="grid-header-row-0">
-			<inp2:m_RenderElement name="pr_grid_th" phrase="la_col_minqty" width="15%"/>
-			<inp2:m_RenderElement name="pr_grid_th" phrase="la_col_maxqty" width="15%"/>
-			<inp2:m_RenderElement name="pr_grid_th" phrase="la_col_cost" width="10%"/>
-			<inp2:m_RenderElement name="pr_grid_th" phrase="la_col_price" width="10%"/>
+			<inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_MinQty" width="15%"/>
+			<inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_MaxQty" width="15%"/>
+			<inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_Cost" width="10%"/>
+			<inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_Price" width="10%"/>
 		<!--##
-			<inp2:m_RenderElement name="pr_grid_th" phrase="la_col_points" width="10%"/>
+			<inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_Points" width="10%"/>
 		##-->
-			<inp2:m_RenderElement name="pr_grid_th" phrase="la_col_negotiated"/>
+			<inp2:m_RenderElement name="pr_grid_th" phrase="column:la_fld_Negotiated"/>
 		</tr>
 		<inp2:pr.tang_ShowPricingForm block="prbracket" IdField="PriceId"/>
-		
+
 		<script type="text/javascript">
 			<inp2:m_if check="m_Get" name="pr_tang">
 				a_toolbar.EnableButton('delete');
Index: branches/5.1.x/units/reports/reports_config.php
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/units/reports/reports_config.php	(.../reports_config.php)	(revision 14257)
+++ branches/5.1.x/units/reports/reports_config.php	(.../reports_config.php)	(revision 14534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: reports_config.php 14257 2011-03-16 21:41:19Z alex $
+* @version	$Id: reports_config.php 14534 2011-09-18 14:13:17Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -74,7 +74,7 @@
 					'ItemSQLs'			=>	Array(	'' => 'SELECT * FROM %1$s',
 																		),
 					'ListSortings'	=> 	Array (
-						'' => Array (							
+						'' => Array (
 							'Sorting' => Array ('Name' => 'asc'),
 						)
 					),
@@ -100,14 +100,14 @@
 						'FromDateTime'	=>	Array('formatter' => 'kDateFormatter', 'default' => '', 'filter_type' => 'range_from', 'filter_field' => 'OrderDate' ),
 						'ToDateTime'	=>	Array('formatter' => 'kDateFormatter', 'default' => '', 'filter_type' => 'range_to', 'filter_field' => 'OrderDate', 'empty_time' => adodb_mktime(23,59,59) ),
 						'Recursive' => Array (
-					    	'type' => 'int', 
-					    	'formatter' => 'kOptionsFormatter', 
+					    	'type' => 'int',
+					    	'formatter' => 'kOptionsFormatter',
 					    	'options' => Array (0 => 'la_No', 1 => 'la_Yes'),
 					    	'use_phrases' => 1, 'not_null' => 1, 'default' => 1,
 						),
 						'SkipEmpty' => Array (
-					    	'type' => 'int', 
-					    	'formatter' => 'kOptionsFormatter', 
+					    	'type' => 'int',
+					    	'formatter' => 'kOptionsFormatter',
 					    	'options' => Array (0 => 'la_No', 1 => 'la_Yes'),
 					    	'use_phrases' => 1, 'not_null' => 1, 'default' => 1,
 						),
@@ -120,12 +120,12 @@
 																'module' => 'core',
 															),
 															'Fields' => Array(
-																			'Name' => Array( 'title' => 'la_col_Name', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
-																			'Start' => Array( 'title' => 'la_col_Start', 'filter_block' => 'grid_date_range_filter'),
-																			'End' => Array( 'title' => 'la_col_End', 'filter_block' => 'grid_date_range_filter'),
-																			'GroupId' => Array( 'title' => 'la_col_Group', 'filter_block' => 'grid_options_filter'),
-																			'Type' => Array( 'title' => 'la_col_Type', 'filter_block' => 'grid_options_filter'),
-																			'Amount' => Array( 'title' => 'la_col_Amount', 'filter_block' => 'grid_float_range_filter'),
+																			'Name' => Array('data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
+																			'Start' => Array('filter_block' => 'grid_date_range_filter'),
+																			'End' => Array('filter_block' => 'grid_date_range_filter'),
+																			'GroupId' => Array( 'title' => 'column:la_fld_Group', 'filter_block' => 'grid_options_filter'),
+																			'Type' => Array('filter_block' => 'grid_options_filter'),
+																			'Amount' => Array('filter_block' => 'grid_float_range_filter'),
 																		),
 
 													),
Index: branches/5.1.x/units/shipping/shipping_config.php
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/units/shipping/shipping_config.php	(.../shipping_config.php)	(revision 14257)
+++ branches/5.1.x/units/shipping/shipping_config.php	(.../shipping_config.php)	(revision 14534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: shipping_config.php 14257 2011-03-16 21:41:19Z alex $
+* @version	$Id: shipping_config.php 14534 2011-09-18 14:13:17Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -127,7 +127,7 @@
 							'Sorting' => Array ('Name' => 'asc'),
 						)
 					),
-					
+
 					'Fields'			=>	Array (
 					    'ShippingID' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 					    'Code' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'required' => 1, 'max_len' =>25, 'error_msgs' => Array ('required' => 'Please fill in')),
@@ -166,15 +166,15 @@
 						'FreeShippingMinAmount'	=>	Array ('type' => 'float', 'formatter' => 'kFormatter', 'not_null' => 1, 'format' => '%.2f', 'default' => 0),
 						'IsFreePromoShipping' => Array (
 							'type' => 'int',
-							'formatter' => 'kOptionsFormatter', 
+							'formatter' => 'kOptionsFormatter',
 							'options' => Array (0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1,
 							'default' => 0, 'not_null' => 1,
 						),
 						'InsuranceFee' => Array ('type' => 'float', 'default' => null),
 						'InsuranceType' => Array (
 							'type' => 'int',
 							'formatter' => 'kOptionsFormatter',
-							'options' => Array (2 => 'la_Percent', 1 => 'la_Flat',), 'use_phrases' => 1, 
+							'options' => Array (2 => 'la_Percent', 1 => 'la_Flat',), 'use_phrases' => 1,
 							'not_null' => 1, 'default' => 2
 						),
 					),
@@ -188,14 +188,14 @@
 								'module' => 'core',
 							),
 							'Fields' => Array (
-								'ShippingID' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
-								'Name' => Array ( 'title' => 'la_col_ShippingName', 'filter_block' => 'grid_range_filter', 'width' => 250, ),
-								'Type' => Array ( 'title' => 'la_col_ShippingType', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
-								'SpeedCode' => Array ( 'title' => 'la_col_SpeedCode', 'filter_block' => 'grid_like_filter', 'width' => 130, ),
-								'BaseFee' => Array ( 'title' => 'la_col_BaseFee', 'filter_block' => 'grid_float_range_filter', 'width' => 100, ),
-								'IsFreePromoShipping' => Array ( 'title' => 'la_col_IsFreePromoShipping', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
-								'Status' => Array ( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 170, ),
-								/*'CODFlatSurcharge' => Array ( 'title' => 'la_col_CODFlatSurcharge', 'filter_block' => 'grid_float_range_filter'),*/
+								'ShippingID' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+								'Name' => Array ( 'title' => 'column:la_fld_ShippingName', 'filter_block' => 'grid_range_filter', 'width' => 250, ),
+								'Type' => Array ( 'title' => 'column:la_fld_ShippingType', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+								'SpeedCode' => Array ( 'filter_block' => 'grid_like_filter', 'width' => 130, ),
+								'BaseFee' => Array ( 'filter_block' => 'grid_float_range_filter', 'width' => 100, ),
+								'IsFreePromoShipping' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 70, ),
+								'Status' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 170, ),
+//								'CODFlatSurcharge' => Array ( 'filter_block' => 'grid_float_range_filter'),
 																			),
 
 																),
Index: branches/5.1.x/units/discount_items/discount_items_config.php
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/units/discount_items/discount_items_config.php	(.../discount_items_config.php)	(revision 14257)
+++ branches/5.1.x/units/discount_items/discount_items_config.php	(.../discount_items_config.php)	(revision 14534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: discount_items_config.php 14257 2011-03-16 21:41:19Z alex $
+* @version	$Id: discount_items_config.php 14534 2011-09-18 14:13:17Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -119,7 +119,7 @@
 										2 => 'icon16_product_pending.png',
 									),
 																	'Fields' => Array(
-																			'ProductId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_item_td', 'filter_block' => 'grid_range_filter'),
+																			'ProductId' => Array( 'title'=>'column:la_fld_Id', 'data_block' => 'grid_item_td', 'filter_block' => 'grid_range_filter'),
 																			'ItemName' => Array( 'title'=>'la_col_ItemName', 'filter_block' => 'grid_like_filter'),
 																			'ItemType' => Array( 'title'=>'la_col_ItemType', 'filter_block' => 'grid_options_filter'),
 																		),
Index: branches/5.1.x/units/products/products_config.php
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/units/products/products_config.php	(.../products_config.php)	(revision 14257)
+++ branches/5.1.x/units/products/products_config.php	(.../products_config.php)	(revision 14534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: products_config.php 14257 2011-03-16 21:41:19Z alex $
+* @version	$Id: products_config.php 14534 2011-09-18 14:13:17Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -492,12 +492,12 @@
 					    'Expire'				=>	Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' =>null),
 					    'Type'					=>	Array (
 					    	'type' => 'int',
-					    	'formatter' => 'kOptionsFormatter', 'use_phrases' => 1,							
+					    	'formatter' => 'kOptionsFormatter', 'use_phrases' => 1,
 							'options' => Array (
 								PRODUCT_TYPE_TANGIBLE => 'la_product_tangible',
 								PRODUCT_TYPE_SUBSCRIPTION => 'la_product_subscription',
 								PRODUCT_TYPE_SERVICE => 'la_product_service',
-								PRODUCT_TYPE_DOWNLOADABLE => 'la_product_downloadable', 
+								PRODUCT_TYPE_DOWNLOADABLE => 'la_product_downloadable',
 								/* PRODUCT_TYPE_PACKAGE => 'la_product_package', */
 							),
 							'not_null' => 1, 'default' => 1,
@@ -506,9 +506,9 @@
 					    'ModifiedById'			=>	Array ('type' => 'int', 'default' => NULL),
 					    'CreatedById' => Array (
 			            	'type' => 'int',
-			            	'formatter' => 'kLEFTFormatter', 
+			            	'formatter' => 'kLEFTFormatter',
 			            	'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'),
-			            	'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'PortalUser 
+			            	'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'PortalUser
 			            					WHERE `%s` = \'%s\'',
 			            	'left_key_field' => 'PortalUserId',
 			            	'left_title_field' => 'Login',
@@ -640,21 +640,20 @@
 								'NEW' => 'icon16_product_new.png',
 							),
 							'Fields' => Array (
-								'ProductId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+								'ProductId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
 								'SKU' => Array ( 'title' => 'la_col_ProductSKU', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
 								'Name' => Array ( 'title' => 'la_col_ProductName', 'data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
-								'Priority' => Array('title'=>'la_col_Priority', 'filter_block' => 'grid_range_filter', 'width' => 65),
-								'Type'	=>	Array ('title' => 'la_col_ProductType', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
-								'Manufacturer'	=>	Array ('title' => 'la_col_Manufacturer', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
-								'Price'	=>	Array ('title' => 'la_col_Price', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
-								'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
-								'QtyInStock'	=>	Array ('title' => 'la_col_Qty', 'data_block' => 'qty_td', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
-								'QtyBackOrdered'	=>	Array ('title' => 'la_col_QtyBackOrdered', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
-								'OnSale'	=>	Array ('title' => 'la_col_OnSale', 'filter_block' => 'grid_options_filter', 'width' => 70, ),							/*
-								'Weight' => Array ( 'title' => 'la_col_ProductWeight', 'filter_block' => 'grid_float_range_filter', 'width' => 150, ),
+								'Priority' => Array('filter_block' => 'grid_range_filter', 'width' => 65),
+								'Type'	=>	Array ('title' => 'column:la_fld_ProductType', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
+								'Manufacturer'	=>	Array ('filter_block' => 'grid_like_filter', 'width' => 100, ),
+								'Price'	=>	Array ('filter_block' => 'grid_range_filter', 'width' => 70, ),
+								'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 70, ),
+								'QtyInStock'	=>	Array ('title' => 'column:la_fld_Qty', 'data_block' => 'qty_td', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
+								'QtyBackOrdered'	=>	Array ('title' => 'column:la_fld_QtyBackOrdered', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
+								'OnSale'	=>	Array ('title' => 'column:la_fld_OnSale', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
+								/*'Weight' => Array ( 'title' => 'la_col_ProductWeight', 'filter_block' => 'grid_float_range_filter', 'width' => 150, ),
 								'CreatedOn' => Array ( 'title' => 'la_col_ProductCreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
-								'BackOrderDate' => Array ( 'title' => 'la_col_ProductBackOrderDate', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
-							*/
+								'BackOrderDate' => Array ( 'title' => 'la_col_ProductBackOrderDate', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),*/
 							),
 						),
 
@@ -668,16 +667,16 @@
 							),
 							'Selector' => 'radio',
 							'Fields' => Array (
-								'ProductId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+								'ProductId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
 								'SKU' => Array ( 'title' => 'la_col_ProductSKU', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
 								'Name' => Array ( 'title' => 'la_col_ProductName', 'data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
-								'Priority' => Array('title'=>'la_col_Priority', 'filter_block' => 'grid_range_filter', 'width' => 65),
-								'Type'	=>	Array ('title' => 'la_col_ProductType', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
-								'Manufacturer'	=>	Array ('title' => 'la_col_Manufacturer', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
-								'Price'	=>	Array ('title' => 'la_col_Price', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
-								'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ),
-								'QtyInStock'	=>	Array ('title' => 'la_col_Qty', 'data_block' => 'qty_td', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
-								'QtyBackOrdered'	=>	Array ('title' => 'la_col_QtyBackOrdered', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
+								'Priority' => Array('filter_block' => 'grid_range_filter', 'width' => 65),
+								'Type'	=>	Array ('title' => 'column:la_fld_ProductType', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
+								'Manufacturer'	=>	Array ('filter_block' => 'grid_like_filter', 'width' => 100, ),
+								'Price'	=>	Array ('filter_block' => 'grid_range_filter', 'width' => 70, ),
+								'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 70, ),
+								'QtyInStock'	=>	Array ('title' => 'column:la_fld_Qty', 'data_block' => 'qty_td', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
+								'QtyBackOrdered'	=>	Array ('title' => 'column:la_fld_QtyBackOrdered', 'filter_block' => 'grid_range_filter', 'width' => 80, ),
 
 							),
 						),
Index: branches/5.1.x/units/affiliates/affiliates_config.php
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/units/affiliates/affiliates_config.php	(.../affiliates_config.php)	(revision 14257)
+++ branches/5.1.x/units/affiliates/affiliates_config.php	(.../affiliates_config.php)	(revision 14534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: affiliates_config.php 14257 2011-03-16 21:41:19Z alex $
+* @version	$Id: affiliates_config.php 14534 2011-09-18 14:13:17Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -195,13 +195,13 @@
 								'module' => 'core',
 							),
 							'Fields' => Array(
-																				'AffiliateId'		=> Array( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
-																				'UserName'			=> Array( 'title' => 'la_col_UserName', 'data_block' => 'grid_userlink_td', 'filter_block' => 'grid_like_filter'),
+																				'AffiliateId'		=> Array( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+																				'UserName'			=> Array( 'data_block' => 'grid_userlink_td', 'filter_block' => 'grid_like_filter'),
 																				'PlanName' 			=> Array( 'title'=>'la_col_PlanName', 'filter_block' => 'grid_like_filter'),
 
-																				'PaymentTypeId'		=> Array( 'title' => 'la_col_PaymentType', 'filter_block' => 'grid_options_filter', 'width' => 120, ),
-																				'CreatedOn'			=> Array( 'title' => 'la_col_RegisteredOn', 'format' => '_regional_DateFormat', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
-																				'Status'			=> Array( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+																				'PaymentTypeId'		=> Array( 'title' => 'column:la_fld_PaymentType', 'filter_block' => 'grid_options_filter', 'width' => 120, ),
+																				'CreatedOn'			=> Array( 'title' => 'column:la_fld_RegisteredOn', 'format' => '_regional_DateFormat', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+																				'Status'			=> Array( 'filter_block' => 'grid_options_filter', 'width' => 100, ),
 																		),
 													),
 
Index: branches/5.1.x/units/taxesdestinations/taxesdestinations_config.php
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/units/taxesdestinations/taxesdestinations_config.php	(.../taxesdestinations_config.php)	(revision 14257)
+++ branches/5.1.x/units/taxesdestinations/taxesdestinations_config.php	(.../taxesdestinations_config.php)	(revision 14534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: taxesdestinations_config.php 14257 2011-03-16 21:41:19Z alex $
+* @version	$Id: taxesdestinations_config.php 14534 2011-09-18 14:13:17Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -72,23 +72,4 @@
 						'StdDestId' => Array ('type' => 'int', 'default' => 0),
 						'DestValue' => Array ('type' => 'string', 'max_len' => 255, 'default' => NULL),
 					),
-
-					/*'Grids'	=> Array(
-								'Default'		=>	Array(
-																	'Icons' => Array(
-																		'default' => 'icon16_item.gif',
-																		1 => 'icon16_item.gif',
-																		0 => 'icon16_disabled.gif'
-																		'module' => 'core',
-																	),
-																	'Fields' => Array(
-																			'Name' => Array( 'title'=>'la_col_ImageName' , 'data_block' => 'grid_checkbox_td'),
-																			'AltName' => Array( 'title'=>'la_col_AltName' ),
-																			'Url' => Array( 'title'=>'la_col_ImageUrl', 'data_block' => 'image_url_td' ),
-																			'Enabled' => Array( 'title'=>'la_col_ImageEnabled' ),
-																			'Preview' => Array( 'title'=>'la_col_Preview', 'data_block' => 'preview' ),
-																		),
-
-																),
-													),*/
 	);
\ No newline at end of file
Index: branches/5.1.x/units/product_option_combinations/product_option_combinations_config.php
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/units/product_option_combinations/product_option_combinations_config.php	(.../product_option_combinations_config.php)	(revision 14257)
+++ branches/5.1.x/units/product_option_combinations/product_option_combinations_config.php	(.../product_option_combinations_config.php)	(revision 14534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: product_option_combinations_config.php 14257 2011-03-16 21:41:19Z alex $
+* @version	$Id: product_option_combinations_config.php 14534 2011-09-18 14:13:17Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -102,10 +102,10 @@
 							),
 							'Fields' => Array (
 								'Combination' => Array ( 'title' => 'la_col_Combination', 'data_block' => 'grid_combination_td', 'filter_block' => 'grid_empty_filter'),
-								'SKU'		=>	Array ( 'title' => 'la_col_SKU', 'filter_block' => 'grid_like_filter'),
-								'Availability' => Array ( 'title' => 'la_col_Availability', 'filter_block' => 'grid_options_filter'),
-								'Price' => Array ( 'title' => 'la_col_Price', 'data_block' => 'price_td', 'filter_block' => 'grid_float_range_filter'),
-								/*'Weight' => Array ( 'title' => 'la_col_Weight', 'data_block' => 'weight_td', 'filter_block' => 'grid_float_range_filter'),*/
+								'SKU'		=>	Array ( 'filter_block' => 'grid_like_filter'),
+								'Availability' => Array ( 'filter_block' => 'grid_options_filter'),
+								'Price' => Array ( 'data_block' => 'price_td', 'filter_block' => 'grid_float_range_filter'),
+//								'Weight' => Array ( 'data_block' => 'weight_td', 'filter_block' => 'grid_float_range_filter'),
 							),
 						),
 
@@ -117,11 +117,11 @@
 							'Selector' => 'radio',
 							'Fields' => Array (
 								'Combination'	=>	Array ('title' => 'la_col_Combination', 'data_block' => 'grid_combination_td', 'filter_block' => 'grid_empty_filter'),
-								'SKU'			=>	Array ('title' => 'la_col_SKU', 'filter_block' => 'grid_like_filter'),
-								'QtyInStock'	=>	Array ('title' => 'la_col_QtyInStock', 'filter_block' => 'grid_range_filter'),
-								'QtyReserved'	=>	Array ('title' => 'la_col_QtyReserved', 'filter_block' => 'grid_range_filter'),
-								'QtyBackOrdered' =>	Array ('title' => 'la_col_QtyBackOrdered', 'filter_block' => 'grid_range_filter'),
-								'QtyOnOrder'	=>	Array ('title' => 'la_col_QtyOnOrder', 'filter_block' => 'grid_range_filter'),
+								'SKU'			=>	Array ('filter_block' => 'grid_like_filter'),
+								'QtyInStock'	=>	Array ('filter_block' => 'grid_range_filter'),
+								'QtyReserved'	=>	Array ('filter_block' => 'grid_range_filter'),
+								'QtyBackOrdered' =>	Array ('filter_block' => 'grid_range_filter'),
+								'QtyOnOrder'	=>	Array ('filter_block' => 'grid_range_filter'),
 							),
 						),
 
@@ -133,8 +133,8 @@
 							),
 							'Fields' => Array (
 								'Combination' => Array ( 'title' => 'la_col_Combination', 'data_block' => 'grid_combination_td', 'filter_block' => 'grid_empty_filter'),
-								'FinalPrice' => Array ( 'title' => 'la_col_Price', 'data_block' => 'grid_data_td', 'currency' => 'primary', 'filter_block' => 'grid_float_range_filter'),
-								/*'Weight' => Array ( 'title' => 'la_col_Weight', 'data_block' => 'weight_td', 'filter_block' => 'grid_float_range_filter'),*/
+								'FinalPrice' => Array ( 'title' => 'column:la_fld_Price', 'data_block' => 'grid_data_td', 'currency' => 'primary', 'filter_block' => 'grid_float_range_filter'),
+//								'Weight' => Array ('data_block' => 'weight_td', 'filter_block' => 'grid_float_range_filter'),
 							),
 						),
 					),
Index: branches/5.1.x/units/payment_type_currencies/payment_type_currencies_config.php
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/units/payment_type_currencies/payment_type_currencies_config.php	(.../payment_type_currencies_config.php)	(revision 14257)
+++ branches/5.1.x/units/payment_type_currencies/payment_type_currencies_config.php	(.../payment_type_currencies_config.php)	(revision 14534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: payment_type_currencies_config.php 14257 2011-03-16 21:41:19Z alex $
+* @version	$Id: payment_type_currencies_config.php 14534 2011-09-18 14:13:17Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -61,6 +61,4 @@
 							            'PaymentTypeId' => Array('type' => 'int','not_null' => 1, 'default' => 0),
 							            'CurrencyId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
 							        ),
-
-					'Grids'	=> Array(),
 	);
\ No newline at end of file
Index: branches/5.1.x/units/affiliate_plans_items/affiliate_plans_items_config.php
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/units/affiliate_plans_items/affiliate_plans_items_config.php	(.../affiliate_plans_items_config.php)	(revision 14257)
+++ branches/5.1.x/units/affiliate_plans_items/affiliate_plans_items_config.php	(.../affiliate_plans_items_config.php)	(revision 14534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: affiliate_plans_items_config.php 14257 2011-03-16 21:41:19Z alex $
+* @version	$Id: affiliate_plans_items_config.php 14534 2011-09-18 14:13:17Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -116,7 +116,7 @@
 																		2 => 'icon16_product_pending.png',
 																	),
 																	'Fields' => Array(
-																			'ProductId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_item_checkbox_td' ),
+																			'ProductId' => Array( 'title'=>'column:la_fld_Id', 'data_block' => 'grid_item_checkbox_td' ),
 																			'ItemName' => Array( 'title'=>'la_col_ItemName' ),
 																			'ItemType' => Array( 'title'=>'la_col_ItemType' ),
 																		),
Index: branches/5.1.x/units/taxes/taxes_config.php
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/units/taxes/taxes_config.php	(.../taxes_config.php)	(revision 14257)
+++ branches/5.1.x/units/taxes/taxes_config.php	(.../taxes_config.php)	(revision 14534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: taxes_config.php 14257 2011-03-16 21:41:19Z alex $
+* @version	$Id: taxes_config.php 14534 2011-09-18 14:13:17Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -43,9 +43,9 @@
 						),*/
 					'IDField'			=>	'TaxZoneId',
 					'TitleField'		=>  'Name',
-											
+
 					'TitlePresets'		=>	Array (
-						'default'	=>	Array (	
+						'default'	=>	Array (
 							'new_status_labels' => Array ('tax' => '!la_title_AddingTaxZone!'),
 							'edit_status_labels' => Array ('tax' => '!la_title_EditingTaxZone!'),
 						),
@@ -58,7 +58,7 @@
 							'format' => "#tax_status# '#tax_titlefield#' - !la_title_General!",
 						),
 					),
-					
+
 					'PermSection'		=>	Array ('main' => 'in-commerce:taxes'),
 
 					'Sections'			=>	Array (
@@ -94,17 +94,17 @@
 					    'Type' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array (1 => 'la_ByCountry', 2 => 'la_ByState', 3 => 'la_ByZIP'), 'not_null' => 1, 'default' => 1),
 					    'TaxValue' => Array ('type' => 'double', 'not_null' => 1, 'default' => 0),
 					    'ApplyToShipping' => Array (
-					    	'type' => 'int', 
-					    	'formatter' => 'kOptionsFormatter', 
+					    	'type' => 'int',
+					    	'formatter' => 'kOptionsFormatter',
 					    	'options' =>Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1,
-							'default' => 0, 'not_null' => 1, 
+							'default' => 0, 'not_null' => 1,
 						),
 					    'ApplyToProcessing' => Array (
-					    	'type' => 'int', 
-					    	'formatter' => 'kOptionsFormatter', 
+					    	'type' => 'int',
+					    	'formatter' => 'kOptionsFormatter',
 					    	'options' =>Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1,
-							'default' => 0, 'not_null' => 1, 
-						), 
+							'default' => 0, 'not_null' => 1,
+						),
 					),
 
 					'Grids'	=> Array (
@@ -117,12 +117,12 @@
 								'module' => 'core',
 							),
 							'Fields' => Array (
-								'TaxZoneId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
-								'Name' => Array ( 'title' => 'la_col_TaxZoneName', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
-								'TaxValue' => Array ( 'title' => 'la_col_TaxValue', 'filter_block' => 'grid_float_range_filter', 'width' => 110, ),
-								'Type' => Array ( 'title' => 'la_col_ZoneType', 'filter_block' => 'grid_options_filter', 'width' => 90, ),
-								'ApplyToShipping' => Array ( 'title' => 'la_col_TaxApplyToShipping', 'filter_block' => 'grid_options_filter', 'width' => 140, ),
-								'ApplyToProcessing' => Array ( 'title' => 'la_col_TaxApplyToProcessing', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
+								'TaxZoneId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+								'Name' => Array ( 'title' => 'column:la_fld_TaxZoneName', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+								'TaxValue' => Array ( 'title' => 'column:la_fld_TaxValue', 'filter_block' => 'grid_float_range_filter', 'width' => 110, ),
+								'Type' => Array ( 'title' => 'column:la_fld_ZoneType', 'filter_block' => 'grid_options_filter', 'width' => 90, ),
+								'ApplyToShipping' => Array ( 'title' => 'column:la_fld_TaxApplyToShipping', 'filter_block' => 'grid_options_filter', 'width' => 140, ),
+								'ApplyToProcessing' => Array ( 'title' => 'column:la_fld_TaxApplyToProcessing', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
 							),
 						),
 					),
Index: branches/5.1.x/units/affiliate_plans/affiliate_plans_config.php
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/units/affiliate_plans/affiliate_plans_config.php	(.../affiliate_plans_config.php)	(revision 14257)
+++ branches/5.1.x/units/affiliate_plans/affiliate_plans_config.php	(.../affiliate_plans_config.php)	(revision 14534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: affiliate_plans_config.php 14257 2011-03-16 21:41:19Z alex $
+* @version	$Id: affiliate_plans_config.php 14534 2011-09-18 14:13:17Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -91,14 +91,14 @@
 			            'MinPaymentAmount' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
 			            'Enabled' => Array (
 			            	'type' => 'int',
-							'formatter' => 'kOptionsFormatter', 
-			            	'options' => Array ( 0 => 'la_Disabled', 1 => 'la_Active', ), 'use_phrases' => 1,							
-							'not_null' => 1, 'default' => 0, 
+							'formatter' => 'kOptionsFormatter',
+			            	'options' => Array ( 0 => 'la_Disabled', 1 => 'la_Active', ), 'use_phrases' => 1,
+							'not_null' => 1, 'default' => 0,
 						),
 			            'IsPrimary' => Array (
 			            	'type' => 'int',
-							'formatter' => 'kOptionsFormatter', 
-			            	'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1,							
+							'formatter' => 'kOptionsFormatter',
+			            	'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1,
 							'not_null' => 1, 'default' => 0,
 						),
 					),
@@ -114,10 +114,10 @@
 										'module' => 'core',
 									),
 									'Fields' => Array (
-										'AffiliatePlanId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
-										'Name' 			=> Array ( 'title' => 'la_col_Name', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
-										'PlanType'		=> Array ( 'title' => 'la_col_PlanType', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
-										'Enabled'		=> Array ( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
+										'AffiliatePlanId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+										'Name' 			=> Array ( 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+										'PlanType'		=> Array ( 'filter_block' => 'grid_options_filter', 'width' => 150, ),
+										'Enabled'		=> Array ( 'title' => 'column:la_fld_Status', 'filter_block' => 'grid_options_filter', 'width' => 80, ),
 									),
 								),
 
Index: branches/5.1.x/admin_templates/orders/orders_edit_preview.tpl
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/admin_templates/orders/orders_edit_preview.tpl	(.../orders_edit_preview.tpl)	(revision 14257)
+++ branches/5.1.x/admin_templates/orders/orders_edit_preview.tpl	(.../orders_edit_preview.tpl)	(revision 14534)
@@ -228,7 +228,7 @@
 		<tr class="subsectiontitle">
 			<td width="70%"<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders"> colspan="2"</inp2:m_if> nowrap><inp2:m_Phrase label="la_col_Product"/></td>
 			<td width="10%" nowrap style="text-align: center"><inp2:m_Phrase label="la_col_Quantity"/></td>
-			<td width="10%" nowrap style="text-align: right"><inp2:m_Phrase label="la_col_Price"/></td>
+			<td width="10%" nowrap style="text-align: right"><inp2:m_Phrase label="column:la_fld_Price"/></td>
 			<td width="10%" nowrap style="text-align: right"><inp2:m_Phrase label="la_col_ExtendedPrice"/></td>
 		</tr>
 
Index: branches/5.1.x/units/files/files_config.php
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/units/files/files_config.php	(.../files_config.php)	(revision 14257)
+++ branches/5.1.x/units/files/files_config.php	(.../files_config.php)	(revision 14534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: files_config.php 14257 2011-03-16 21:41:19Z alex $
+* @version	$Id: files_config.php 14534 2011-09-18 14:13:17Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -130,13 +130,13 @@
 									'module' => 'core',
 								),
 																	'Fields' => Array (
-																			'FileId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'module' => 'In-Portal', 'filter_block' => 'grid_range_filter'),
-																			'Name' => Array ( 'title' => 'la_col_FileName', 'data_block' => 'file_caption_td', 'filter_block' => 'grid_like_filter'),
-																			'FilePath' => Array ( 'title' => 'la_col_FilePath', 'filter_block' => 'grid_like_filter'),
-																			'Version' => Array ( 'title' => 'la_col_Version', 'filter_block' => 'grid_like_filter'),
+																			'FileId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'module' => 'In-Portal', 'filter_block' => 'grid_range_filter'),
+																			'Name' => Array ( 'title' => 'column:la_fld_FileName', 'data_block' => 'file_caption_td', 'filter_block' => 'grid_like_filter'),
+																			'FilePath' => Array ( 'filter_block' => 'grid_like_filter'),
+																			'Version' => Array ( 'filter_block' => 'grid_like_filter'),
 																			'Size' => Array ( 'title' => 'la_col_Size', 'filter_block' => 'grid_float_range_filter'),
-																			'AddedOn' => Array ( 'title' => 'la_col_AddedOn', 'format' => '_regional_DateFormat', 'filter_block' => 'grid_date_range_filter'),
-																			'Status' => Array ( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter'),
+																			'AddedOn' => Array ( 'format' => '_regional_DateFormat', 'filter_block' => 'grid_date_range_filter'),
+																			'Status' => Array ( 'filter_block' => 'grid_options_filter'),
 																		),
 														),
 							),
Index: branches/5.1.x/units/sections/section_eh.php
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/units/sections/section_eh.php	(.../section_eh.php)	(revision 14257)
+++ branches/5.1.x/units/sections/section_eh.php	(.../section_eh.php)	(revision 14534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: section_eh.php 14257 2011-03-16 21:41:19Z alex $
+* @version	$Id: section_eh.php 14534 2011-09-18 14:13:17Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2010 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -82,10 +82,10 @@
 			$this->Application->setUnitOption($event->MasterEvent->Prefix, 'Fields', array_merge_recursive2($fields, $new_fields));
 
 			$new_columns = Array (
-				'BillingCountry' => Array ('title' => 'la_col_BillingCountry', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
-				'ShippingCountry' => Array ('title' => 'la_col_ShippingCountry', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
-				'PrimaryCurrencyId' => Array ('title' => 'la_col_Currency', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
-				'PrimaryPaymentTypeId' => Array ('title' => 'la_col_PaymentType', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
+				'BillingCountry' => Array ('filter_block' => 'grid_options_filter', 'width' => 250, ),
+				'ShippingCountry' => Array ('filter_block' => 'grid_options_filter', 'width' => 250, ),
+				'PrimaryCurrencyId' => Array ('title' => 'column:la_fld_Currency', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
+				'PrimaryPaymentTypeId' => Array ('title' => 'column:la_fld_PaymentType', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
 			);
 
 			$grids = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'Grids');
Index: branches/5.1.x/units/discounts/discounts_config.php
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/units/discounts/discounts_config.php	(.../discounts_config.php)	(revision 14257)
+++ branches/5.1.x/units/discounts/discounts_config.php	(.../discounts_config.php)	(revision 14534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: discounts_config.php 14257 2011-03-16 21:41:19Z alex $
+* @version	$Id: discounts_config.php 14534 2011-09-18 14:13:17Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -127,14 +127,14 @@
 								'module' => 'core',
 							),
 							'Fields' => Array (
-								'DiscountId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
-								'Name' => Array( 'title'=>'la_col_Name', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
-								'Start' => Array( 'title'=>'la_col_Start', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
-								'End' => Array( 'title'=>'la_col_End', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
-								'GroupId' => Array( 'title'=>'la_col_Group', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
-								'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 90, ),
-								'Status' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 90, ),
-								'Amount' => Array( 'title'=>'la_col_Amount', 'filter_block' => 'grid_float_range_filter', 'width' => 100, ),
+								'DiscountId' => Array( 'title'=>'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+								'Name' => Array( 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+								'Start' => Array( 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+								'End' => Array( 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+								'GroupId' => Array( 'title'=>'column:la_fld_Group', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
+								'Type' => Array( 'filter_block' => 'grid_options_filter', 'width' => 90, ),
+								'Status' => Array( 'filter_block' => 'grid_options_filter', 'width' => 90, ),
+								'Amount' => Array( 'filter_block' => 'grid_float_range_filter', 'width' => 100, ),
 							),
 						),
 					),
Index: branches/5.1.x/units/shipping_costs/shipping_costs_config.php
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/units/shipping_costs/shipping_costs_config.php	(.../shipping_costs_config.php)	(revision 14257)
+++ branches/5.1.x/units/shipping_costs/shipping_costs_config.php	(.../shipping_costs_config.php)	(revision 14534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: shipping_costs_config.php 14257 2011-03-16 21:41:19Z alex $
+* @version	$Id: shipping_costs_config.php 14534 2011-09-18 14:13:17Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -57,20 +57,4 @@
 											    'Flat' => Array('type' => 'double', 'formatter' => 'kFormatter', 'default' => 0),
 											    'PerUnit' => Array('type' => 'double', 'formatter' => 'kFormatter', 'default' => 0),
 											),
-
-					/*
-					'Grids'	=> Array(
-								'Default'		=>	Array(
-																	'Icons' => Array(
-																		'default' => 'icon16_item.png',
-																		'module' => 'core',
-																	),
-																	'Fields' => Array(
-																	'Name' => Array( 'width'=>150, 'title'=>'la_col_Title', 'data_block'=>'grid_checkbox_td' ),
-																	'CODallowed' => Array( 'width'=>100, 'title'=>'la_col_CODallowed' )
-																			),
-
-																),
-													),
-													*/
 	);
\ No newline at end of file
Index: branches/5.1.x/units/orders/orders_config.php
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/units/orders/orders_config.php	(.../orders_config.php)	(revision 14257)
+++ branches/5.1.x/units/orders/orders_config.php	(.../orders_config.php)	(revision 14534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_config.php 14257 2011-03-16 21:41:19Z alex $
+* @version	$Id: orders_config.php 14534 2011-09-18 14:13:17Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -510,13 +510,14 @@
 							),
 
 							'Fields' => Array (
-								'OrderId'		=>	Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),																										'OrderNumber'	=> Array ( 'title' => 'la_col_OrderNumber', 'data_block' => 'grid_ordernumber_td', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+								'OrderId'		=>	Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+								'OrderNumber'	=> Array ( 'data_block' => 'grid_ordernumber_td', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
 								'OrderDate' => Array ( 'title' => 'la_col_OrderDate', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
 								'CustomerName'	=> Array ( 'title' => 'la_col_CustomerName', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 140, ),
-								'PaymentType'	=> Array ( 'title' => 'la_col_PaymentType', 'data_block' => 'grid_billinglink_td', 'filter_block' => 'grid_options_filter', 'width' => 140, ),
-								'TotalAmount'	=> Array ( 'title' => 'la_col_TotalAmount', 'data_block' => 'grid_previewlink_td', 'filter_block' => 'grid_range_filter', 'width' => 140, ),
-								'AffiliateUser'	=> Array ( 'title' => 'la_col_AffiliateUser', 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 140, ),
-								'OnHold' => Array ('title' => 'la_col_OnHold', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+								'PaymentType'	=> Array ( 'data_block' => 'grid_billinglink_td', 'filter_block' => 'grid_options_filter', 'width' => 140, ),
+								'TotalAmount'	=> Array ( 'data_block' => 'grid_previewlink_td', 'filter_block' => 'grid_range_filter', 'width' => 140, ),
+								'AffiliateUser'	=> Array ( 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 140, ),
+								'OnHold' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
 							),
 						),
 
@@ -528,17 +529,17 @@
 								'module' => 'core',
 							),
 							'Fields' => Array (
-								'OrderId'		=>	Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
-								'OrderNumber'	=>	Array ('title' => 'la_col_OrderNumber', 'data_block' => 'grid_ordernumber_td', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
-								'Status'		=>	Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+								'OrderId'		=>	Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+								'OrderNumber'	=>	Array ('data_block' => 'grid_ordernumber_td', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+								'Status'		=>	Array ('filter_block' => 'grid_options_filter', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
 								'OrderDate'	=>	Array ('title' => 'la_col_OrderDate', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
 								'CustomerName'		=>	Array ('title' => 'la_col_CustomerName', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter'),
-								'PaymentType'	=> 	Array ('title' => 'la_col_PaymentType', 'data_block' => 'grid_billinglink_td', 'filter_block' => 'grid_options_filter'),
-								'TotalAmount'	=>	Array ('title' => 'la_col_TotalAmount', 'data_block' => 'grid_previewlink_td', 'filter_block' => 'grid_float_range_filter'),
-								'AffiliateUser'	=>	Array ( 'title' => 'la_col_AffiliateUser', 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_user_like_filter'),
-								'OrderIP'		=>	Array ('title' => 'la_col_OrderIP', 'filter_block' => 'grid_like_filter'),
-								'Username'		=>	Array ('title' => 'la_col_Username', 'filter_block' => 'grid_user_like_filter'),
-								'PaymentAccount'	=>	Array ('title' => 'la_col_CreditCardNumber', 'filter_block' => 'grid_like_filter'),
+								'PaymentType'	=> 	Array ('data_block' => 'grid_billinglink_td', 'filter_block' => 'grid_options_filter'),
+								'TotalAmount'	=>	Array ('data_block' => 'grid_previewlink_td', 'filter_block' => 'grid_float_range_filter'),
+								'AffiliateUser'	=>	Array ('data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_user_like_filter'),
+								'OrderIP'		=>	Array ('filter_block' => 'grid_like_filter'),
+								'Username'		=>	Array ('filter_block' => 'grid_user_like_filter'),
+								'PaymentAccount'	=>	Array ('title' => 'column:la_fld_CreditCardNumber', 'filter_block' => 'grid_like_filter'),
 							),
 						),
 					),
Index: branches/5.1.x/units/currencies/currencies_config.php
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/units/currencies/currencies_config.php	(.../currencies_config.php)	(revision 14257)
+++ branches/5.1.x/units/currencies/currencies_config.php	(.../currencies_config.php)	(revision 14534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: currencies_config.php 14257 2011-03-16 21:41:19Z alex $
+* @version	$Id: currencies_config.php 14534 2011-09-18 14:13:17Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -111,14 +111,14 @@
 			            'Modified' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
 			            'Status' => Array (
 			            	'type' => 'int',
-							'formatter' => 'kOptionsFormatter', 
-			            	'options' => Array ( 1 => 'la_Active', 0 => 'la_Disabled' ), 'use_phrases' => 1,							
-							'not_null' => 1, 'default' => 1, 
+							'formatter' => 'kOptionsFormatter',
+			            	'options' => Array ( 1 => 'la_Active', 0 => 'la_Disabled' ), 'use_phrases' => 1,
+							'not_null' => 1, 'default' => 1,
 						),
 			            'IsPrimary' => Array (
 			            	'type' => 'int',
-							'formatter' => 'kOptionsFormatter', 
-			            	'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1,							
+							'formatter' => 'kOptionsFormatter',
+			            	'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1,
 							'not_null' => 1, 'default' => 0,
 						),
 			            'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
@@ -139,12 +139,12 @@
 								'module' => 'core',
 							),
 							'Fields' => Array (
-								'CurrencyId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
-								'ISO' => Array ( 'title' => 'la_col_ISOCode', 'data_block' => 'currency_caption_td', 'filter_block' => 'grid_like_filter', 'width' => 90, ),
-								'Translation' => Array ( 'title' => 'la_col_CurrencyName', 'use_phrases' => 1, 'filter_block' => 'grid_like_filter', 'width' => 250, ),
-								'RateToPrimary' => Array ( 'title' => 'la_col_RateToPrimary', 'filter_block' => 'grid_float_range_filter', 'width' => 130, ),
+								'CurrencyId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
+								'ISO' => Array ( 'title' => 'column:la_fld_ISOCode', 'data_block' => 'currency_caption_td', 'filter_block' => 'grid_like_filter', 'width' => 90, ),
+								'Translation' => Array ( 'title' => 'column:la_fld_CurrencyName', 'use_phrases' => 1, 'filter_block' => 'grid_like_filter', 'width' => 250, ),
+								'RateToPrimary' => Array ( 'title' => 'column:la_fld_RateToPrimary', 'filter_block' => 'grid_float_range_filter', 'width' => 130, ),
 								'Modified' => Array ( 'title' => 'la_col_LastUpdated', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
-								'Status' => Array ( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
+								'Status' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 100, ),
 																		),
 
 																),
Index: branches/5.1.x/units/destinations/destinations_config.php
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/units/destinations/destinations_config.php	(.../destinations_config.php)	(revision 14257)
+++ branches/5.1.x/units/destinations/destinations_config.php	(.../destinations_config.php)	(revision 14534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: destinations_config.php 14257 2011-03-16 21:41:19Z alex $
+* @version	$Id: destinations_config.php 14534 2011-09-18 14:13:17Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -57,22 +57,4 @@
 			            'StdDestId' => Array('type' => 'int', 'default' => 0, ),
 			            'DestValue' => Array('type' => 'string', 'max_len' => 255, 'default' => null, ),
 					),
-					/*'Grids'	=> Array(
-								'Default'		=>	Array(
-																	'Icons' => Array(
-																		'default' => 'icon16_item.gif',
-																		1 => 'icon16_item.gif',
-																		0 => 'icon16_disabled.gif'
-																		'module' => 'core',
-																	),
-																	'Fields' => Array(
-																			'Name' => Array( 'title'=>'la_col_ImageName' , 'data_block' => 'grid_checkbox_td'),
-																			'AltName' => Array( 'title'=>'la_col_AltName' ),
-																			'Url' => Array( 'title'=>'la_col_ImageUrl', 'data_block' => 'image_url_td' ),
-																			'Enabled' => Array( 'title'=>'la_col_ImageEnabled' ),
-																			'Preview' => Array( 'title'=>'la_col_Preview', 'data_block' => 'preview' ),
-																		),
-
-																),
-													),*/
 	);
\ No newline at end of file
Index: branches/5.1.x/units/coupon_items/coupon_items_config.php
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/units/coupon_items/coupon_items_config.php	(.../coupon_items_config.php)	(revision 14257)
+++ branches/5.1.x/units/coupon_items/coupon_items_config.php	(.../coupon_items_config.php)	(revision 14534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: coupon_items_config.php 14257 2011-03-16 21:41:19Z alex $
+* @version	$Id: coupon_items_config.php 14534 2011-09-18 14:13:17Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -32,7 +32,7 @@
 				'DoEvent' => 'OnDeleteCouponItem',
 			),
 		),
-					
+
 		'QueryString' => Array(
 			1 => 'id',
 			2 => 'Page',
@@ -41,22 +41,22 @@
 		),
 
 		'IDField' => 'CouponItemId',
-		'StatusField' => Array('Status'),		
+		'StatusField' => Array('Status'),
 		'TableName' => TABLE_PREFIX . 'ProductsCouponItems',
 
 		'ForeignKey' => 'CouponId',
 		'ParentTableKey' => 'CouponId',
 		'ParentPrefix' => 'coup',
 		'AutoDelete' => true,
 		'AutoClone' => true,
-		
+
 		'ListSQLs' => Array(
 			'' => '	SELECT %1$s.* %2$s
 						FROM %1$s
 						LEFT JOIN ' . TABLE_PREFIX . 'Products p ON %1$s.ItemResourceId = p.ResourceId
 						LEFT JOIN ' . TABLE_PREFIX . 'Category c ON %1$s.ItemResourceId = c.ResourceId',
 			), // key - special, value - list select sql
-			
+
 		'ItemSQLs' => Array(
 			'' => 'SELECT * FROM %s',
 		),
@@ -65,13 +65,13 @@
 			Array(
 				'prefix' => 'd', 'key' => 'DiscountId', 'ForeignKey' => 'DiscountId'),
 		),*/
-		
+
 		'ListSortings' => Array(
 			'' => Array(
 				'Sorting' => Array('ItemName' => 'asc'),
 			),
 		),
-		
+
 		'CalculatedFields' => Array(
 			'' => Array(
 				'ProductId' => 'p.ProductId',
@@ -120,7 +120,7 @@
 		    	'type' => 'int',
 		    	'formatter' => 'kOptionsFormatter',
 		    	'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled'), 'use_phrases' => 1,
-				'default' => 2, 
+				'default' => 2,
 			),
 			'CategoryId' => Array ('type' => 'int', 'default' => 0),
 		),
@@ -140,11 +140,11 @@
 					2 => 'icon16_product_pending.png',
 				),
 				'Fields' => Array(
-					'ProductId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_item_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+					'ProductId' => Array( 'title'=>'column:la_fld_Id', 'data_block' => 'grid_item_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
 					'ItemName' => Array( 'title'=>'la_col_ItemName', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
 					'ItemType' => Array( 'title'=>'la_col_CouponItemType', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
 				),
 			),
 		),
-		
+
 	);
\ No newline at end of file
Index: branches/5.1.x/units/affiliate_payments/affiliate_payments_config.php
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/units/affiliate_payments/affiliate_payments_config.php	(.../affiliate_payments_config.php)	(revision 14257)
+++ branches/5.1.x/units/affiliate_payments/affiliate_payments_config.php	(.../affiliate_payments_config.php)	(revision 14534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: affiliate_payments_config.php 14257 2011-03-16 21:41:19Z alex $
+* @version	$Id: affiliate_payments_config.php 14534 2011-09-18 14:13:17Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -126,12 +126,12 @@
 																'module' => 'core',
 															),
 															'Fields' => Array(
-																			'AffiliatePaymentId'=> Array( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
-																			'PaymentDate'		=> Array( 'title' => 'la_col_PaymentDate', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
-																			'Amount'			=> Array( 'title' => 'la_col_Amount', 'filter_block' => 'grid_float_range_filter'),
-																			'Comment'			=> Array( 'title' => 'la_col_Comment', 'filter_block' => 'grid_like_filter', 'first_chars' => 50),
-																			'PaymentTypeId'		=> Array( 'title' => 'la_col_PaymentType', 'filter_block' => 'grid_options_filter'),
-																			'PaymentReference'	=> Array( 'title' => 'la_col_PaymentReference', 'filter_block' => 'grid_like_filter', 'first_chars' => 50),
+																			'AffiliatePaymentId'=> Array( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+																			'PaymentDate'		=> Array( 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+																			'Amount'			=> Array( 'filter_block' => 'grid_float_range_filter'),
+																			'Comment'			=> Array( 'filter_block' => 'grid_like_filter', 'first_chars' => 50),
+																			'PaymentTypeId'		=> Array( 'title' => 'column:la_fld_PaymentType', 'filter_block' => 'grid_options_filter'),
+																			'PaymentReference'	=> Array( 'filter_block' => 'grid_like_filter', 'first_chars' => 50),
 																		),
 													),
 								'Log'			=>	Array(
@@ -140,13 +140,13 @@
 																'module' => 'core',
 															),
 															'Fields' => Array(
-																			'AffiliatePaymentId'=> Array( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
-																			'Username'			=> Array( 'title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'filter_block' => 'grid_like_filter'),
-																			'PaymentDate'		=> Array( 'title' => 'la_col_PaymentDate', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
-																			'Amount'			=> Array( 'title' => 'la_col_Amount', 'data_block' => 'grid_currency_td', 'filter_block' => 'grid_float_range_filter'),
-																			'Comment'			=> Array( 'title' => 'la_col_Comment', 'filter_block' => 'grid_like_filter', 'first_chars' => 50),
-																			'PaymentTypeId'		=> Array( 'title' => 'la_col_PaymentType', 'filter_block' => 'grid_options_filter'),
-																			'PaymentReference'	=> Array( 'title' => 'la_col_PaymentReference', 'filter_block' => 'grid_like_filter', 'first_chars' => 50),
+																			'AffiliatePaymentId'=> Array( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+																			'Username'			=> Array( 'data_block' => 'grid_userlink_td', 'filter_block' => 'grid_like_filter'),
+																			'PaymentDate'		=> Array( 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+																			'Amount'			=> Array( 'data_block' => 'grid_currency_td', 'filter_block' => 'grid_float_range_filter'),
+																			'Comment'			=> Array( 'filter_block' => 'grid_like_filter', 'first_chars' => 50),
+																			'PaymentTypeId'		=> Array( 'title' => 'column:la_fld_PaymentType', 'filter_block' => 'grid_options_filter'),
+																			'PaymentReference'	=> Array( 'filter_block' => 'grid_like_filter', 'first_chars' => 50),
 																		),
 													),
 
Index: branches/5.1.x/units/shipping_quote_engines/shipping_quote_engines_config.php
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/units/shipping_quote_engines/shipping_quote_engines_config.php	(.../shipping_quote_engines_config.php)	(revision 14257)
+++ branches/5.1.x/units/shipping_quote_engines/shipping_quote_engines_config.php	(.../shipping_quote_engines_config.php)	(revision 14534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: shipping_quote_engines_config.php 14257 2011-03-16 21:41:19Z alex $
+* @version	$Id: shipping_quote_engines_config.php 14534 2011-09-18 14:13:17Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -207,11 +207,11 @@
 								'module' => 'core',
 							),
 							'Fields' => Array (
-								'EngineId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
-								'Name' => Array ( 'title' => 'la_col_ShippingQuoteEngineName', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
-								'FlatSurcharge' => Array ( 'title' => 'la_col_FlatSurcharge', 'filter_block' => 'grid_float_range_filter', 'width' => 150, ),
-								'PercentSurcharge' => Array ( 'title' => 'la_col_PercentSurcharge', 'filter_block' => 'grid_float_range_filter', 'width' => 150, ),
-								'Status' => Array ( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 150, ),
+								'EngineId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ),
+								'Name' => Array ( 'title' => 'column:la_fld_ShippingQuoteEngineName', 'filter_block' => 'grid_like_filter', 'width' => 250, ),
+								'FlatSurcharge' => Array ( 'filter_block' => 'grid_float_range_filter', 'width' => 150, ),
+								'PercentSurcharge' => Array ( 'filter_block' => 'grid_float_range_filter', 'width' => 150, ),
+								'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 150, ),
 							),
 						),
 					),
Index: branches/5.1.x/units/order_items/order_items_config.php
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/units/order_items/order_items_config.php	(.../order_items_config.php)	(revision 14257)
+++ branches/5.1.x/units/order_items/order_items_config.php	(.../order_items_config.php)	(revision 14534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: order_items_config.php 14257 2011-03-16 21:41:19Z alex $
+* @version	$Id: order_items_config.php 14534 2011-09-18 14:13:17Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -142,7 +142,7 @@
 					'Quantity' => Array ('title' => 'la_col_Quantity', 'data_block' => 'grid_quantity_td', 'filter_block' => 'grid_range_filter'),
 					'QuantityReserved' => Array ('title' => 'la_col_QuantityReserved', 'filter_block' => 'grid_range_filter'),
 					'QuantityAvailable' => Array ('title' => 'la_col_QuantityAvailable', 'filter_block' => 'grid_range_filter'),
-					'Price' => Array ('title' => 'la_col_Price', 'data_block' => 'grid_price_td', 'filter_block' => 'grid_float_range_filter'),
+					'Price' => Array ('data_block' => 'grid_price_td', 'filter_block' => 'grid_float_range_filter'),
 					'ExtendedPrice' => Array ('title' => 'la_col_ExtendedPrice', 'data_block' => 'grid_extendedprice_td', 'filter_block' => 'grid_float_range_filter'),
 
 					'ReturnType' => Array ('title' => 'la_col_ReturnType', 'data_block' => 'grid_options_td', 'filter_block' => 'grid_options_filter'),
@@ -163,7 +163,7 @@
 					'Quantity' => Array ('title' => 'la_col_Quantity', 'filter_block' => 'grid_range_filter'),
 					'QuantityReserved' => Array ('title' => 'la_col_QuantityReserved', 'filter_block' => 'grid_range_filter'),
 					'QuantityAvailable' => Array ('title' => 'la_col_QuantityAvailable', 'filter_block' => 'grid_range_filter'),
-					'Price' => Array ('title' => 'la_col_Price', 'filter_block' => 'grid_float_range_filter'),
+					'Price' => Array ('filter_block' => 'grid_float_range_filter'),
 					'ExtendedPrice' => Array ('title' => 'la_col_ExtendedPrice', 'filter_block' => 'grid_float_range_filter'),
 
 					'ReturnType' => Array ('title' => 'la_col_ReturnType', 'data_block' => 'grid_options_td', 'filter_block' => 'grid_options_filter'),
Index: branches/5.1.x/units/payment_type/payment_type_config.php
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/units/payment_type/payment_type_config.php	(.../payment_type_config.php)	(revision 14257)
+++ branches/5.1.x/units/payment_type/payment_type_config.php	(.../payment_type_config.php)	(revision 14534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: payment_type_config.php 14257 2011-03-16 21:41:19Z alex $
+* @version	$Id: payment_type_config.php 14534 2011-09-18 14:13:17Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -151,11 +151,11 @@
 								'module' => 'core',
 							),
 							'Fields' => Array (
-								'PaymentTypeId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50),
+								'PaymentTypeId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50),
 								'Name' => Array ( 'title' => 'la_col_PaymentTypeName', 'data_block' => 'payment_caption_td', 'filter_block' => 'grid_like_filter', 'width' => 200),
-								'Description' => Array ( 'title' => 'la_col_Description', 'filter_block' => 'grid_like_filter', 'width' => 200),
+								'Description' => Array ('filter_block' => 'grid_like_filter', 'width' => 200),
 								'BuiltIn' => Array ( 'title' => 'la_col_BuiltIn', 'filter_block' => 'grid_options_filter', 'width' => 100),
-								'Status' => Array ( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100),
+								'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
 							),
 						),
 					),
Index: branches/5.1.x/units/product_options/product_options_config.php
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/units/product_options/product_options_config.php	(.../product_options_config.php)	(revision 14257)
+++ branches/5.1.x/units/product_options/product_options_config.php	(.../product_options_config.php)	(revision 14534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: product_options_config.php 14257 2011-03-16 21:41:19Z alex $
+* @version	$Id: product_options_config.php 14534 2011-09-18 14:13:17Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -93,11 +93,11 @@
 																		'module' => 'core',
 																	),	// icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used
 																	'Fields' => Array (
-																			'ProductOptionId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
-																			'Name' => Array ( 'title' => 'la_col_Name', 'data_block' => 'option_name_td', 'filter_block' => 'grid_like_filter'),
-																			'OptionType' => Array ( 'title' => 'la_col_OptionType', 'filter_block' => 'grid_options_filter'),
-																			'Required' => Array ( 'title' => 'la_col_Required', 'filter_block' => 'grid_options_filter'),
-																			/*'Listable' => Array ( 'title' => 'la_col_Listable', 'filter_block' => 'grid_options_filter'),*/
+																			'ProductOptionId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
+																			'Name' => Array ( 'data_block' => 'option_name_td', 'filter_block' => 'grid_like_filter'),
+																			'OptionType' => Array ( 'filter_block' => 'grid_options_filter'),
+																			'Required' => Array ( 'filter_block' => 'grid_options_filter'),
+//																			'Listable' => Array ('filter_block' => 'grid_options_filter'),
 																			),
 
 																),
Index: branches/5.1.x/units/affiliate_payment_types/affiliate_payment_types_config.php
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/units/affiliate_payment_types/affiliate_payment_types_config.php	(.../affiliate_payment_types_config.php)	(revision 14257)
+++ branches/5.1.x/units/affiliate_payment_types/affiliate_payment_types_config.php	(.../affiliate_payment_types_config.php)	(revision 14534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: affiliate_payment_types_config.php 14257 2011-03-16 21:41:19Z alex $
+* @version	$Id: affiliate_payment_types_config.php 14534 2011-09-18 14:13:17Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -86,14 +86,14 @@
 			            'Description' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL),
 			            'Status' => Array (
 			            	'type' => 'int',
-							'formatter' => 'kOptionsFormatter', 
-			            	'options' => Array ( 0 => 'la_Disabled', 1 => 'la_Active', ), 'use_phrases' => 1,							
-							'not_null' => 1, 'default' => 0, 
+							'formatter' => 'kOptionsFormatter',
+			            	'options' => Array ( 0 => 'la_Disabled', 1 => 'la_Active', ), 'use_phrases' => 1,
+							'not_null' => 1, 'default' => 0,
 						),
 			            'IsPrimary' => Array (
 			            	'type' => 'int',
-							'formatter' => 'kOptionsFormatter', 
-			            	'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1,							
+							'formatter' => 'kOptionsFormatter',
+			            	'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1,
 							'not_null' => 1, 'default' => 0,
 						),
 			            'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
@@ -110,9 +110,9 @@
 										'module' => 'core',
 									),
 															'Fields' => Array (
-																			'PaymentTypeId' 	=> Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
-																			'Name'				=> Array ( 'title' => 'la_col_Name', 'data_block' => 'affiliate_payment_type_caption_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
-																			'Description'		=> Array ( 'title' => 'la_col_Description', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+																			'PaymentTypeId' 	=> Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+																			'Name'				=> Array ( 'data_block' => 'affiliate_payment_type_caption_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
+																			'Description'		=> Array ( 'filter_block' => 'grid_like_filter', 'width' => 200, ),
 																		),
 													),
 
Index: branches/5.1.x/install/english.lang
===================================================================
diff -u -r14261 -r14534
--- branches/5.1.x/install/english.lang	(.../english.lang)	(revision 14261)
+++ branches/5.1.x/install/english.lang	(.../english.lang)	(revision 14534)
@@ -1,4 +1,4 @@
-<LANGUAGES Version="3">
+<LANGUAGES Version="4">
 	<LANGUAGE Encoding="base64" PackName="English" LocalName="English" DateFormat="m/d/Y" TimeFormat="g:i A" InputDateFormat="m/d/Y" InputTimeFormat="g:i:s A" DecimalPoint="." ThousandSep="," Charset="utf-8" UnitSystem="2" Locale="en-US" UserDocsUrl="http://docs.in-portal.org/eng/index.php">
 		<PHRASES>
 			<PHRASE Label="la_AccountLogin" Module="In-Commerce" Type="1">QWNjb3VudA==</PHRASE>
@@ -82,127 +82,48 @@
 			<PHRASE Label="la_COD" Module="In-Commerce" Type="1">Q09E</PHRASE>
 			<PHRASE Label="la_COD_Flat_Surcharge" Module="In-Commerce" Type="1">Q09EIEZsYXQgU3VyY2hhcmdl</PHRASE>
 			<PHRASE Label="la_COD_Percent_Surcharge" Module="In-Commerce" Type="1">Q09EIFBlcmNlbnQgU3VyY2hhcmdl</PHRASE>
-			<PHRASE Label="la_col_AccessDuration" Module="In-Commerce" Type="1">QWNjZXNzIER1cmF0aW9u</PHRASE>
-			<PHRASE Label="la_col_AccessDurationUnit" Module="In-Commerce" Type="1">QWNjZXNzIER1cmF0aW9uIFVuaXQ=</PHRASE>
-			<PHRASE Label="la_col_AddedOn" Module="In-Commerce" Type="1">QWRkZWQgT24=</PHRASE>
-			<PHRASE Label="la_col_AffiliateUser" Module="In-Commerce" Type="1">QWZmaWxpYXRlIFVzZXI=</PHRASE>
-			<PHRASE Label="la_col_Amount" Module="In-Commerce" Type="1">QW1vdW50</PHRASE>
-			<PHRASE Label="la_col_Availability" Module="In-Commerce" Type="1">QXZhaWwu</PHRASE>
-			<PHRASE Label="la_col_BaseFee" Module="In-Commerce" Type="1">QmFzZSBGZWU=</PHRASE>
-			<PHRASE Label="la_col_BillingCountry" Module="In-Commerce" Type="1">QmlsbGluZyBDb3VudHJ5</PHRASE>
 			<PHRASE Label="la_col_BuiltIn" Module="In-Commerce" Type="1">QnVpbHQtSW4=</PHRASE>
-			<PHRASE Label="la_col_CODallowed" Module="In-Commerce" Type="1">Q09EIEFsbG93ZWQ=</PHRASE>
-			<PHRASE Label="la_col_Code" Module="In-Commerce" Type="1">Q29kZQ==</PHRASE>
-			<PHRASE Label="la_col_CODFlatSurcharge" Module="In-Commerce" Type="1">Q09EIEZsYXQgU3VyZWNoYXJnZQ==</PHRASE>
 			<PHRASE Label="la_col_CODFlatSurecharge" Module="In-Commerce" Type="1">Q09EIGZsYXQgc3VyZWNoYXJnZQ==</PHRASE>
-			<PHRASE Label="la_col_CODPercentSurcharge" Module="In-Commerce" Type="1">Q09EIFBlcmNlbnQgU3VyY2hhcmdl</PHRASE>
 			<PHRASE Label="la_col_Combination" Module="In-Commerce" Type="1">Q29tYmluYXRpb24=</PHRASE>
-			<PHRASE Label="la_col_Comment" Module="In-Commerce" Type="1">Q29tbWVudA==</PHRASE>
 			<PHRASE Label="la_col_Commission" Module="In-Commerce" Type="1">QWZmaWxsaWF0ZSBDb21taXNzaW9u</PHRASE>
-			<PHRASE Label="la_col_Cost" Module="In-Commerce" Type="1">Q29zdA==</PHRASE>
-			<PHRASE Label="la_col_CouponCode" Module="In-Commerce" Type="1">Q291cG9uIENvZGU=</PHRASE>
 			<PHRASE Label="la_col_CouponItemType" Module="In-Commerce" Type="1">Q291cG9uIEl0ZW0gVHlwZQ==</PHRASE>
-			<PHRASE Label="la_col_CreditCardNumber" Module="In-Commerce" Type="1">Q3JlZGl0IENhcmQgTnVtYmVy</PHRASE>
-			<PHRASE Label="la_col_Currency" Module="In-Commerce" Type="1">Q3VycmVuY3k=</PHRASE>
-			<PHRASE Label="la_col_CurrencyName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
-			<PHRASE Label="la_col_CurrencySymbol" Module="In-Commerce" Type="1">U3ltYm9s</PHRASE>
-			<PHRASE Label="la_col_CurrencySymbolPosition" Module="In-Commerce" Type="1">U3ltYm9sIFBvc2l0aW9u</PHRASE>
 			<PHRASE Label="la_col_CustomerName" Module="In-Commerce" Type="1">Q3VzdG9tZXIgTmFtZQ==</PHRASE>
-			<PHRASE Label="la_col_DisplayOnFront" Module="In-Commerce" Type="1">RGlzcGxheSBvbiBGcm9udC1FbmQ=</PHRASE>
 			<PHRASE Label="la_col_DownloadedFileName" Module="In-Commerce" Type="1">RmlsZW5hbWU=</PHRASE>
 			<PHRASE Label="la_col_DownloadedProductName" Module="In-Commerce" Type="1">UHJvZHVjdCBOYW1l</PHRASE>
-			<PHRASE Label="la_col_End" Module="In-Commerce" Type="1">RW5k</PHRASE>
 			<PHRASE Label="la_col_EndedOn" Module="In-Commerce" Type="1">RW5kZWQgT24=</PHRASE>
-			<PHRASE Label="la_col_Expiration" Module="In-Commerce" Type="1">RXhwaXJhdGlvbg==</PHRASE>
 			<PHRASE Label="la_col_ExtendedPrice" Module="In-Commerce" Type="1">RXh0LiBQcmljZQ==</PHRASE>
-			<PHRASE Label="la_col_FlatSurcharge" Module="In-Commerce" Type="1">RmxhdCBTdXJjaGFyZ2U=</PHRASE>
-			<PHRASE Label="la_col_FromAmount" Module="In-Commerce" Type="1">RnJvbSBBbW91bnQ=</PHRASE>
 			<PHRASE Label="la_col_FromUser" Module="In-Commerce" Type="1">RnJvbSBVc2Vy</PHRASE>
 			<PHRASE Label="la_col_GMV" Module="In-Commerce" Type="1">R01W</PHRASE>
-			<PHRASE Label="la_col_Group" Module="In-Commerce" Type="1">R3JvdXA=</PHRASE>
-			<PHRASE Label="la_col_IPAddress" Module="In-Commerce" Type="1">SVAgQWRkcmVzcw==</PHRASE>
-			<PHRASE Label="la_col_IsFreePromoShipping" Module="In-Commerce" Type="1">UHJvbW8=</PHRASE>
 			<PHRASE Label="la_col_ItemName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
 			<PHRASE Label="la_col_ItemType" Module="In-Commerce" Type="1">RGlzY291bnQgSXRlbSBUeXBl</PHRASE>
 			<PHRASE Label="la_col_LastUpdated" Module="In-Commerce" Type="1">TGFzdCBVcGRhdGVk</PHRASE>
-			<PHRASE Label="la_col_LastUsedBy" Module="In-Commerce" Type="1">TGFzdCBVc2VkIEJ5</PHRASE>
-			<PHRASE Label="la_col_LastUsedOn" Module="In-Commerce" Type="1">TGFzdCBVc2VkIE9u</PHRASE>
-			<PHRASE Label="la_col_Listable" Module="In-Commerce" Type="1">TGlzdGFibGU=</PHRASE>
-			<PHRASE Label="la_col_ListingQuantity" Module="In-Commerce" Type="1">TGlzdGluZyBRdHk=</PHRASE>
-			<PHRASE Label="la_col_Manufacturer" Module="In-Commerce" Type="1">TWFudWZhY3R1cmVy</PHRASE>
 			<PHRASE Label="la_col_ManufacturerName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
 			<PHRASE Label="la_col_Marketplace" Module="In-Commerce" Type="1">TWFya2V0cGxhY2U=</PHRASE>
-			<PHRASE Label="la_col_MaxQty" Module="In-Commerce" Type="1">TWF4IFF0eQ==</PHRASE>
-			<PHRASE Label="la_col_MinQty" Module="In-Commerce" Type="1">TWluIFF0eQ==</PHRASE>
-			<PHRASE Label="la_col_Negotiated" Module="In-Commerce" Type="1">TmVnb3RpYXRlZA==</PHRASE>
-			<PHRASE Label="la_col_NumberOfUses" Module="In-Commerce" Type="1">TnVtYmVyIE9mIFVzZXM=</PHRASE>
-			<PHRASE Label="la_col_OnHold" Module="In-Commerce" Type="1">T24gSG9sZA==</PHRASE>
-			<PHRASE Label="la_col_OnSale" Module="In-Commerce" Type="1">T24gU2FsZQ==</PHRASE>
-			<PHRASE Label="la_col_OptionType" Module="In-Commerce" Type="1">T3B0aW9uIFR5cGU=</PHRASE>
 			<PHRASE Label="la_col_OrderDate" Module="In-Commerce" Type="1">RGF0ZQ==</PHRASE>
-			<PHRASE Label="la_col_OrderIP" Module="In-Commerce" Type="1">SVAgQWRkcmVzcw==</PHRASE>
-			<PHRASE Label="la_col_OrderNumber" Module="In-Commerce" Type="1">TnVtYmVy</PHRASE>
 			<PHRASE Label="la_col_OrderTotal" Module="In-Commerce" Type="1">T3JkZXIgVG90YWw=</PHRASE>
-			<PHRASE Label="la_col_PaymentDate" Module="In-Commerce" Type="1">UGF5bWVudCBEYXRl</PHRASE>
-			<PHRASE Label="la_col_PaymentReference" Module="In-Commerce" Type="1">UGF5bWVudCBSZWZlcmVuY2U=</PHRASE>
-			<PHRASE Label="la_col_PaymentType" Module="In-Commerce" Type="1">UGF5bWVudCBUeXBl</PHRASE>
 			<PHRASE Label="la_col_PaymentTypeName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
 			<PHRASE Label="la_col_Percent" Module="In-Commerce" Type="1">UGVyY2VudA==</PHRASE>
-			<PHRASE Label="la_col_PercentSurcharge" Module="In-Commerce" Type="1">UGVyY2VudCBTdXJjaGFyZ2U=</PHRASE>
 			<PHRASE Label="la_col_PlanName" Module="In-Commerce" Type="1">UGxhbiBOYW1l</PHRASE>
-			<PHRASE Label="la_col_PlanType" Module="In-Commerce" Type="1">UGxhbiBUeXBl</PHRASE>
-			<PHRASE Label="la_col_Points" Module="In-Commerce" Type="1">UG9pbnRz</PHRASE>
-			<PHRASE Label="la_col_Price" Module="In-Commerce" Type="1">UHJpY2U=</PHRASE>
 			<PHRASE Label="la_col_Processing" Module="In-Commerce" Type="1">UHJvY2Vzc2luZw==</PHRASE>
 			<PHRASE Label="la_col_Product" Module="In-Commerce" Type="1">UHJvZHVjdA==</PHRASE>
 			<PHRASE Label="la_col_ProductBackOrderDate" Module="In-Commerce" Type="1">QmFja09yZGVyIERhdGU=</PHRASE>
 			<PHRASE Label="la_col_ProductCreatedOn" Module="In-Commerce" Type="1">Q3JlYXRlZCBPbg==</PHRASE>
 			<PHRASE Label="la_col_ProductName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
 			<PHRASE Label="la_col_ProductNameId" Module="In-Commerce" Type="1">UHJvZHVjdCBOYW1lIChJRCk=</PHRASE>
 			<PHRASE Label="la_col_ProductSKU" Module="In-Commerce" Type="1">U0tV</PHRASE>
-			<PHRASE Label="la_col_ProductType" Module="In-Commerce" Type="1">VHlwZQ==</PHRASE>
 			<PHRASE Label="la_col_ProductWeight" Module="In-Commerce" Type="1">V2VpZ2h0</PHRASE>
 			<PHRASE Label="la_col_Profit" Module="In-Commerce" Type="1">UHJvZml0</PHRASE>
-			<PHRASE Label="la_col_Qty" Module="In-Commerce" Type="1">UXR5</PHRASE>
-			<PHRASE Label="la_col_QtyBackordered" Module="In-Commerce" Type="1">QmFja29yZGVyZWQ=</PHRASE>
-			<PHRASE Label="la_col_QtyInStock" Module="In-Commerce" Type="1">UXR5IEluIFN0b2Nr</PHRASE>
-			<PHRASE Label="la_col_QtyInStockMin" Module="In-Commerce" Type="1">UXR5SW5TdG9ja01pbg==</PHRASE>
-			<PHRASE Label="la_col_QtyOnOrder" Module="In-Commerce" Type="1">UXR5IE9uIE9yZGVy</PHRASE>
-			<PHRASE Label="la_col_QtyReserved" Module="In-Commerce" Type="1">UXR5IFJlc2VydmVk</PHRASE>
 			<PHRASE Label="la_col_Quantity" Module="In-Commerce" Type="1">UXR5Lg==</PHRASE>
 			<PHRASE Label="la_col_QuantityAvailable" Module="In-Commerce" Type="1">QXZhaWwu</PHRASE>
 			<PHRASE Label="la_col_QuantityReserved" Module="In-Commerce" Type="1">UmVzZXJ2ZWQ=</PHRASE>
-			<PHRASE Label="la_col_RateToPrimary" Module="In-Commerce" Type="1">UmF0ZSBUbyBQcmltYXJ5</PHRASE>
-			<PHRASE Label="la_col_RegisteredOn" Module="In-Commerce" Type="1">UmVnaXN0ZXJlZCBPbg==</PHRASE>
-			<PHRASE Label="la_col_RemainingAmount" Module="In-Commerce" Type="1">UmVtYWluaW5nIEFtb3VudA==</PHRASE>
-			<PHRASE Label="la_col_Required" Module="In-Commerce" Type="1">UmVxdWlyZWQ=</PHRASE>
 			<PHRASE Label="la_col_ReturnAmount" Module="In-Commerce" Type="1">UmV0LiBBbW91bnQ=</PHRASE>
 			<PHRASE Label="la_col_ReturnedOn" Module="In-Commerce" Type="1">UmV0LiBEYXRl</PHRASE>
 			<PHRASE Label="la_col_ReturnType" Module="In-Commerce" Type="1">UmV0LiBUeXBl</PHRASE>
 			<PHRASE Label="la_col_Shipping" Module="In-Commerce" Type="1">U2hpcHBpbmc=</PHRASE>
-			<PHRASE Label="la_col_ShippingCountry" Module="In-Commerce" Type="1">U2hpcHBpbmcgQ291bnRyeQ==</PHRASE>
 			<PHRASE Label="la_col_ShippingFromLocation" Module="In-Commerce" Type="1">RnJvbSBMb2NhdGlvbg==</PHRASE>
-			<PHRASE Label="la_col_ShippingName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
-			<PHRASE Label="la_col_ShippingQuoteEngineName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
-			<PHRASE Label="la_col_ShippingType" Module="In-Commerce" Type="1">VHlwZQ==</PHRASE>
-			<PHRASE Label="la_col_ShipZoneName" Module="In-Commerce" Type="1">U2hpcHBpbmcgWm9uZSBOYW1l</PHRASE>
 			<PHRASE Label="la_col_Size" Module="In-Commerce" Type="1">U2l6ZQ==</PHRASE>
-			<PHRASE Label="la_col_SKU" Module="In-Commerce" Type="1">U0tV</PHRASE>
-			<PHRASE Label="la_col_SpeedCode" Module="In-Commerce" Type="1">U2hpcHBpbmcgU3BlZWQ=</PHRASE>
-			<PHRASE Label="la_col_Start" Module="In-Commerce" Type="1">U3RhcnQ=</PHRASE>
 			<PHRASE Label="la_col_StartedOn" Module="In-Commerce" Type="1">U3RhcnRlZCBPbg==</PHRASE>
 			<PHRASE Label="la_col_Tax" Module="In-Commerce" Type="1">VGF4</PHRASE>
-			<PHRASE Label="la_col_TaxApplyToProcessing" Module="In-Commerce" Type="1">QXBwbHkgdG8gUHJvY2Vzc2luZw==</PHRASE>
-			<PHRASE Label="la_col_TaxApplyToShipping" Module="In-Commerce" Type="1">QXBwbHkgdG8gU2hpcHBpbmc=</PHRASE>
-			<PHRASE Label="la_col_TaxValue" Module="In-Commerce" Type="1">VGF4IFZhbHVl</PHRASE>
-			<PHRASE Label="la_col_TaxZoneName" Module="In-Commerce" Type="1">VGF4IFpvbmUgTmFtZQ==</PHRASE>
-			<PHRASE Label="la_col_ToAmount" Module="In-Commerce" Type="1">VG8gQW1vdW50</PHRASE>
-			<PHRASE Label="la_col_TotalAmount" Module="In-Commerce" Type="1">VG90YWwgQW1vdW50</PHRASE>
-			<PHRASE Label="la_col_UnitsLimit" Module="In-Commerce" Type="1">TGltaXQ=</PHRASE>
-			<PHRASE Label="la_col_URL" Module="In-Commerce" Type="1">VVJM</PHRASE>
-			<PHRASE Label="la_col_Weight" Module="In-Commerce" Type="1">V2VpZ2h0</PHRASE>
-			<PHRASE Label="la_col_ZoneName" Module="In-Commerce" Type="1">Wm9uZSBOYW1l</PHRASE>
-			<PHRASE Label="la_col_ZoneType" Module="In-Commerce" Type="1">Wm9uZSBUeXBl</PHRASE>
 			<PHRASE Label="la_Combined" Module="In-Commerce" Type="1">Q29tYmluZWQ=</PHRASE>
 			<PHRASE Label="la_comment_LeaveBlank" Module="In-Commerce" Type="1">KGxlYXZlIGJsYW5rIGZvciB1bmxpbWl0ZWQp</PHRASE>
 			<PHRASE Label="la_comm_Any" Module="In-Commerce" Type="1">QW55</PHRASE>
@@ -260,14 +181,14 @@
 			<PHRASE Label="la_FJD" Module="In-Commerce" Type="1">RmlqaSBEb2xsYXI=</PHRASE>
 			<PHRASE Label="la_FKP" Module="In-Commerce" Type="1">RmFsa2xhbmQgSXNsYW5kcyBQb3VuZA==</PHRASE>
 			<PHRASE Label="la_Flat" Module="In-Commerce" Type="1">RmxhdA==</PHRASE>
-			<PHRASE Label="la_fld_AccessDuration" Module="In-Commerce" Type="1">QWNjZXNzIER1cmF0aW9u</PHRASE>
+			<PHRASE Label="la_fld_AccessDuration" Module="In-Commerce" Type="1" Column="QWNjZXNzIER1cmF0aW9u">QWNjZXNzIER1cmF0aW9u</PHRASE>
 			<PHRASE Label="la_fld_AccessDurationType" Module="In-Commerce" Type="1">QWNjZXNzIER1cmF0aW9uIFR5cGU=</PHRASE>
-			<PHRASE Label="la_fld_AccessDurationUnit" Module="In-Commerce" Type="1">QWNjZXNzIER1cmF0aW9uIFVuaXQ=</PHRASE>
+			<PHRASE Label="la_fld_AccessDurationUnit" Module="In-Commerce" Type="1" Column="QWNjZXNzIER1cmF0aW9uIFVuaXQ=">QWNjZXNzIER1cmF0aW9uIFVuaXQ=</PHRASE>
 			<PHRASE Label="la_fld_AccessEnd" Module="In-Commerce" Type="1">QWNjZXNzIEVuZA==</PHRASE>
 			<PHRASE Label="la_fld_AccessGroup" Module="In-Commerce" Type="1">QWNjZXNzIEdyb3Vw</PHRASE>
 			<PHRASE Label="la_fld_AccessStart" Module="In-Commerce" Type="1">QWNjZXNzIFN0YXJ0</PHRASE>
 			<PHRASE Label="la_fld_AccumulatedAmount" Module="In-Commerce" Type="1">QWNjdW11bGF0ZWQgQW1vdW50</PHRASE>
-			<PHRASE Label="la_fld_AddedOn" Module="In-Commerce" Type="1">QWRkZWQgT24=</PHRASE>
+			<PHRASE Label="la_fld_AddedOn" Module="In-Commerce" Type="1" Column="QWRkZWQgT24=">QWRkZWQgT24=</PHRASE>
 			<PHRASE Label="la_fld_Address1" Module="In-Commerce" Type="1">QWRkcmVzcyBMaW5lIDE=</PHRASE>
 			<PHRASE Label="la_fld_Address2" Module="In-Commerce" Type="1">QWRkcmVzcyBMaW5lIDI=</PHRASE>
 			<PHRASE Label="la_fld_AdminComment" Module="In-Commerce" Type="1">QWRtaW4gQ29tbWVudA==</PHRASE>
@@ -277,23 +198,23 @@
 			<PHRASE Label="la_fld_AffiliateLink" Module="In-Commerce" Type="1">QWZmaWxpYXRlIExpbms=</PHRASE>
 			<PHRASE Label="la_fld_AffiliatePlan" Module="In-Commerce" Type="1">QWZmaWxpYXRlIFBsYW4=</PHRASE>
 			<PHRASE Label="la_fld_AffiliatePlanPayment" Module="In-Commerce" Type="1">UGF5bWVudA==</PHRASE>
-			<PHRASE Label="la_fld_AffiliateUser" Module="In-Commerce" Type="1">QWZmaWxpYXRlIFVzZXI=</PHRASE>
+			<PHRASE Label="la_fld_AffiliateUser" Module="In-Commerce" Type="1" Column="QWZmaWxpYXRlIFVzZXI=">QWZmaWxpYXRlIFVzZXI=</PHRASE>
 			<PHRASE Label="la_fld_AllowedShippingTypes" Module="In-Commerce" Type="1">U2VsZWN0ZWQ=</PHRASE>
-			<PHRASE Label="la_fld_Amount" Module="In-Commerce" Type="1">QW1vdW50</PHRASE>
+			<PHRASE Label="la_fld_Amount" Module="In-Commerce" Type="1" Column="QW1vdW50">QW1vdW50</PHRASE>
 			<PHRASE Label="la_fld_AmountToPay" Module="In-Commerce" Type="1">QW1vdW50IFRvIFBheQ==</PHRASE>
 			<PHRASE Label="la_fld_AssignedCoupon" Module="In-Commerce" Type="1">QXNzaWduZWQgQ291cG9u</PHRASE>
 			<PHRASE Label="la_fld_AuthorizationResult" Module="In-Commerce" Type="1">QXV0aG9yaXphdGlvbiBSZXN1bHQ=</PHRASE>
-			<PHRASE Label="la_fld_Availability" Module="In-Commerce" Type="1">QXZhaWxhYmxl</PHRASE>
+			<PHRASE Label="la_fld_Availability" Module="In-Commerce" Type="1" Column="QXZhaWwu">QXZhaWxhYmxl</PHRASE>
 			<PHRASE Label="la_fld_AvailableGroups" Module="In-Commerce" Type="1">QXZhaWxhYmxlIFVzZXIgR3JvdXBz</PHRASE>
 			<PHRASE Label="la_fld_AvailableShippingTypes" Module="In-Commerce" Type="1">QXZhaWxhYmxl</PHRASE>
 			<PHRASE Label="la_fld_BackOrder" Module="In-Commerce" Type="1">QmFja09yZGVy</PHRASE>
 			<PHRASE Label="la_fld_BackOrderDate" Module="In-Commerce" Type="1">QmFja29yZGVyIGF2YWlsYWJpbGl0eSBkYXRl</PHRASE>
-			<PHRASE Label="la_fld_BaseFee" Module="In-Commerce" Type="1">QmFzZSBGZWU=</PHRASE>
+			<PHRASE Label="la_fld_BaseFee" Module="In-Commerce" Type="1" Column="QmFzZSBGZWU=">QmFzZSBGZWU=</PHRASE>
 			<PHRASE Label="la_fld_BillingAddress1" Module="In-Commerce" Type="1">QmlsbGluZyBBZGRyZXNzIExpbmUgMQ==</PHRASE>
 			<PHRASE Label="la_fld_BillingAddress2" Module="In-Commerce" Type="1">QmlsbGluZyBBZGRyZXNzIExpbmUgMg==</PHRASE>
 			<PHRASE Label="la_fld_BillingCity" Module="In-Commerce" Type="1">QmlsbGluZyBDaXR5</PHRASE>
 			<PHRASE Label="la_fld_BillingCompany" Module="In-Commerce" Type="1">QmlsbGluZyBDb21wYW55</PHRASE>
-			<PHRASE Label="la_fld_BillingCountry" Module="In-Commerce" Type="1">QmlsbGluZyBDb3VudHJ5</PHRASE>
+			<PHRASE Label="la_fld_BillingCountry" Module="In-Commerce" Type="1" Column="QmlsbGluZyBDb3VudHJ5">QmlsbGluZyBDb3VudHJ5</PHRASE>
 			<PHRASE Label="la_fld_BillingEmail" Module="In-Commerce" Type="1">QmlsbGluZyBFbWFpbA==</PHRASE>
 			<PHRASE Label="la_fld_BillingFax" Module="In-Commerce" Type="1">QmlsbGluZyBGYXg=</PHRASE>
 			<PHRASE Label="la_fld_BillingPhone" Module="In-Commerce" Type="1">QmlsbGluZyBQaG9uZQ==</PHRASE>
@@ -303,35 +224,35 @@
 			<PHRASE Label="la_fld_BlockShippingAddress" Module="In-Commerce" Type="1">QmxvY2sgU2hpcHBpbmcgQWRkcmVzcyBFZGl0aW5n</PHRASE>
 			<PHRASE Label="la_fld_CaptureResult" Module="In-Commerce" Type="1">Q2FwdHVyZSBSZXN1bHQ=</PHRASE>
 			<PHRASE Label="la_fld_ChargeOnNextApprove" Module="In-Commerce" Type="1">Q2hhcmdlIG9uIE5leHQgQXBwcm92ZQ==</PHRASE>
-			<PHRASE Label="la_fld_CODallowed" Module="In-Commerce" Type="1">Q09EIEFsbG93ZWQ=</PHRASE>
-			<PHRASE Label="la_fld_Code" Module="In-Commerce" Type="1">Q29kZQ==</PHRASE>
-			<PHRASE Label="la_fld_CODFlatSurcharge" Module="In-Commerce" Type="1">Q09EIEZsYXQgU3VyY2hhcmdl</PHRASE>
-			<PHRASE Label="la_fld_CODPercentSurcharge" Module="In-Commerce" Type="1">Q09EIFBlcmNlbnQgU3VyY2hhcmdl</PHRASE>
-			<PHRASE Label="la_fld_Comment" Module="In-Commerce" Type="1">Q29tbWVudA==</PHRASE>
-			<PHRASE Label="la_fld_Cost" Module="In-Commerce" Type="1">Q29zdA==</PHRASE>
+			<PHRASE Label="la_fld_CODallowed" Module="In-Commerce" Type="1" Column="Q09EIEFsbG93ZWQ=">Q09EIEFsbG93ZWQ=</PHRASE>
+			<PHRASE Label="la_fld_Code" Module="In-Commerce" Type="1" Column="Q29kZQ==">Q29kZQ==</PHRASE>
+			<PHRASE Label="la_fld_CODFlatSurcharge" Module="In-Commerce" Type="1" Column="Q09EIEZsYXQgU3VyZWNoYXJnZQ==">Q09EIEZsYXQgU3VyY2hhcmdl</PHRASE>
+			<PHRASE Label="la_fld_CODPercentSurcharge" Module="In-Commerce" Type="1" Column="Q09EIFBlcmNlbnQgU3VyY2hhcmdl">Q09EIFBlcmNlbnQgU3VyY2hhcmdl</PHRASE>
+			<PHRASE Label="la_fld_Comment" Module="In-Commerce" Type="1" Column="Q29tbWVudA==">Q29tbWVudA==</PHRASE>
+			<PHRASE Label="la_fld_Cost" Module="In-Commerce" Type="1" Column="Q29zdA==">Q29zdA==</PHRASE>
 			<PHRASE Label="la_fld_CostType" Module="In-Commerce" Type="1">Q29zdCBUeXBl</PHRASE>
-			<PHRASE Label="la_fld_CouponCode" Module="In-Commerce" Type="1">Q291cG9uIENvZGU=</PHRASE>
-			<PHRASE Label="la_fld_CreditCardNumber" Module="In-Commerce" Type="1">Q3JlZGl0IENhcmQgTnVtYmVy</PHRASE>
+			<PHRASE Label="la_fld_CouponCode" Module="In-Commerce" Type="1" Column="Q291cG9uIENvZGU=">Q291cG9uIENvZGU=</PHRASE>
+			<PHRASE Label="la_fld_CreditCardNumber" Module="In-Commerce" Type="1" Column="Q3JlZGl0IENhcmQgTnVtYmVy">Q3JlZGl0IENhcmQgTnVtYmVy</PHRASE>
 			<PHRASE Label="la_fld_Currencies" Module="In-Commerce" Type="1">Q3VycmVuY2llcw==</PHRASE>
-			<PHRASE Label="la_fld_Currency" Module="In-Commerce" Type="1">Q3VycmVuY3k=</PHRASE>
-			<PHRASE Label="la_fld_CurrencyName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
-			<PHRASE Label="la_fld_CurrencySymbol" Module="In-Commerce" Type="1">U3ltYm9s</PHRASE>
-			<PHRASE Label="la_fld_CurrencySymbolPosition" Module="In-Commerce" Type="1">U3ltYm9sIFBvc2l0aW9u</PHRASE>
+			<PHRASE Label="la_fld_Currency" Module="In-Commerce" Type="1" Column="Q3VycmVuY3k=">Q3VycmVuY3k=</PHRASE>
+			<PHRASE Label="la_fld_CurrencyName" Module="In-Commerce" Type="1" Column="TmFtZQ==">TmFtZQ==</PHRASE>
+			<PHRASE Label="la_fld_CurrencySymbol" Module="In-Commerce" Type="1" Column="U3ltYm9s">U3ltYm9s</PHRASE>
+			<PHRASE Label="la_fld_CurrencySymbolPosition" Module="In-Commerce" Type="1" Column="U3ltYm9sIFBvc2l0aW9u">U3ltYm9sIFBvc2l0aW9u</PHRASE>
 			<PHRASE Label="la_fld_cust_p_ItemTemplate" Module="In-Commerce" Type="1">UHJvZHVjdCBJdGVtIFRlbXBsYXRl</PHRASE>
 			<PHRASE Label="la_fld_Date" Module="In-Commerce" Type="1">RGF0ZQ==</PHRASE>
 			<PHRASE Label="la_fld_DeliveryMethod" Module="In-Commerce" Type="1">RGVsaXZlcnkgTWV0aG9k</PHRASE>
 			<PHRASE Label="la_fld_DescriptionExcerpt" Module="In-Commerce" Type="1">RXhjZXJwdA==</PHRASE>
 			<PHRASE Label="la_fld_Discount" Module="In-Commerce" Type="1">RGlzY291bnQ=</PHRASE>
-			<PHRASE Label="la_fld_DisplayOnFront" Module="In-Commerce" Type="1">RGlzcGxheSBvbiBGcm9udC1FbmQ=</PHRASE>
+			<PHRASE Label="la_fld_DisplayOnFront" Module="In-Commerce" Type="1" Column="RGlzcGxheSBvbiBGcm9udC1FbmQ=">RGlzcGxheSBvbiBGcm9udC1FbmQ=</PHRASE>
 			<PHRASE Label="la_fld_EmptyCellsAre" Module="In-Commerce" Type="1">RW1wdHkgQ2VsbHMgQXJl</PHRASE>
-			<PHRASE Label="la_fld_End" Module="In-Commerce" Type="1">RW5kIERhdGU=</PHRASE>
-			<PHRASE Label="la_fld_Expiration" Module="In-Commerce" Type="1">RXhwaXJhdGlvbg==</PHRASE>
+			<PHRASE Label="la_fld_End" Module="In-Commerce" Type="1" Column="RW5k">RW5kIERhdGU=</PHRASE>
+			<PHRASE Label="la_fld_Expiration" Module="In-Commerce" Type="1" Column="RXhwaXJhdGlvbg==">RXhwaXJhdGlvbg==</PHRASE>
 			<PHRASE Label="la_fld_Featured" Module="In-Commerce" Type="1">RmVhdHVyZWQ=</PHRASE>
 			<PHRASE Label="la_fld_FirstDayDelivery" Module="In-Commerce" Type="1">Rmlyc3QgRGF5</PHRASE>
-			<PHRASE Label="la_fld_FlatSurcharge" Module="In-Commerce" Type="1">RmxhdCBTdXJjaGFyZ2U=</PHRASE>
+			<PHRASE Label="la_fld_FlatSurcharge" Module="In-Commerce" Type="1" Column="RmxhdCBTdXJjaGFyZ2U=">RmxhdCBTdXJjaGFyZ2U=</PHRASE>
 			<PHRASE Label="la_fld_FreeShippingMinAmount" Module="In-Commerce" Type="1">TWluaW11bSBPcmRlciBUb3RhbCBmb3IgRnJlZSBTaGlwcGluZw==</PHRASE>
 			<PHRASE Label="la_fld_From" Module="In-Commerce" Type="1">RnJvbQ==</PHRASE>
-			<PHRASE Label="la_fld_FromAmount" Module="In-Commerce" Type="1">RnJvbSBBbW91bnQ=</PHRASE>
+			<PHRASE Label="la_fld_FromAmount" Module="In-Commerce" Type="1" Column="RnJvbSBBbW91bnQ=">RnJvbSBBbW91bnQ=</PHRASE>
 			<PHRASE Label="la_fld_FromDateTime" Module="In-Commerce" Type="1">RnJvbSBkYXRlL3RpbWU=</PHRASE>
 			<PHRASE Label="la_fld_Gateway" Module="In-Commerce" Type="1">R2F0ZXdheQ==</PHRASE>
 			<PHRASE Label="la_fld_GiftCertificateAmountApplied" Module="In-Commerce" Type="1">R2lmdCBDZXJ0aWZpY2F0ZSBhbW91bnQ=</PHRASE>
@@ -343,70 +264,70 @@
 			<PHRASE Label="la_fld_Insurance_Fee" Module="In-Commerce" Type="1">SW5zdXJhbmNlIENvc3Q=</PHRASE>
 			<PHRASE Label="la_fld_Insurance_Type" Module="In-Commerce" Type="1">SW5zdXJhbmNlIFR5cGU=</PHRASE>
 			<PHRASE Label="la_fld_InventoryStatus" Module="In-Commerce" Type="1">RW5hYmxlZA==</PHRASE>
-			<PHRASE Label="la_fld_IsFreePromoShipping" Module="In-Commerce" Type="1">VXNlIGFzIEZyZWUgUHJvbW8gU2hpcHBpbmc=</PHRASE>
+			<PHRASE Label="la_fld_IsFreePromoShipping" Module="In-Commerce" Type="1" Column="UHJvbW8=">VXNlIGFzIEZyZWUgUHJvbW8gU2hpcHBpbmc=</PHRASE>
 			<PHRASE Label="la_fld_IsRecurringBilling" Module="In-Commerce" Type="1">UmVjdXJyaW5nIEJpbGxpbmc=</PHRASE>
 			<PHRASE Label="la_fld_ItemsSold" Module="In-Commerce" Type="1">SXRlbXMgU29sZA==</PHRASE>
 			<PHRASE Label="la_fld_LastPaymentDate" Module="In-Commerce" Type="1">TGFzdCBQYXltZW50IERhdGU=</PHRASE>
-			<PHRASE Label="la_fld_LastUsedBy" Module="In-Commerce" Type="1">TGFzdCBVc2VkIEJ5</PHRASE>
-			<PHRASE Label="la_fld_LastUsedOn" Module="In-Commerce" Type="1">TGFzdCBVc2VkIE9u</PHRASE>
-			<PHRASE Label="la_fld_Listable" Module="In-Commerce" Type="1">TGlzdGFibGU=</PHRASE>
+			<PHRASE Label="la_fld_LastUsedBy" Module="In-Commerce" Type="1" Column="TGFzdCBVc2VkIEJ5">TGFzdCBVc2VkIEJ5</PHRASE>
+			<PHRASE Label="la_fld_LastUsedOn" Module="In-Commerce" Type="1" Column="TGFzdCBVc2VkIE9u">TGFzdCBVc2VkIE9u</PHRASE>
+			<PHRASE Label="la_fld_Listable" Module="In-Commerce" Type="1" Column="TGlzdGFibGU=">TGlzdGFibGU=</PHRASE>
 			<PHRASE Label="la_fld_ManageCombinations" Module="In-Commerce" Type="1">TWFuYWdlIE9wdGlvbnMgQ29tYmluYXRpb25z</PHRASE>
 			<PHRASE Label="la_fld_ManageShipping" Module="In-Commerce" Type="1">TWFuYWdlIFNoaXBwaW5nIFR5cGVz</PHRASE>
-			<PHRASE Label="la_fld_Manufacturer" Module="In-Commerce" Type="1">TWFudWZhY3R1cmVy</PHRASE>
-			<PHRASE Label="la_fld_MaxQty" Module="In-Commerce" Type="1">TWF4IFF0eQ==</PHRASE>
+			<PHRASE Label="la_fld_Manufacturer" Module="In-Commerce" Type="1" Column="TWFudWZhY3R1cmVy">TWFudWZhY3R1cmVy</PHRASE>
+			<PHRASE Label="la_fld_MaxQty" Module="In-Commerce" Type="1" Column="TWF4IFF0eQ==">TWF4IFF0eQ==</PHRASE>
 			<PHRASE Label="la_fld_MinimumPaymentAmount" Module="In-Commerce" Type="1">TWluaW1hbCBQYXltZW50IEFtb3VudA==</PHRASE>
-			<PHRASE Label="la_fld_MinQty" Module="In-Commerce" Type="1">TWluIFF0eQ==</PHRASE>
+			<PHRASE Label="la_fld_MinQty" Module="In-Commerce" Type="1" Column="TWluIFF0eQ==">TWluIFF0eQ==</PHRASE>
 			<PHRASE Label="la_fld_MSRP" Module="In-Commerce" Type="1">TVNSUA==</PHRASE>
-			<PHRASE Label="la_fld_Negotiated" Module="In-Commerce" Type="1">TmVnb3RpYXRlZA==</PHRASE>
+			<PHRASE Label="la_fld_Negotiated" Module="In-Commerce" Type="1" Column="TmVnb3RpYXRlZA==">TmVnb3RpYXRlZA==</PHRASE>
 			<PHRASE Label="la_fld_NextCharge" Module="In-Commerce" Type="1">TmV4dCBDaGFyZ2UgRGF0ZQ==</PHRASE>
-			<PHRASE Label="la_fld_NumberOfUses" Module="In-Commerce" Type="1">TnVtYmVyIE9mIFVzZXM=</PHRASE>
-			<PHRASE Label="la_fld_OnHold" Module="In-Commerce" Type="1">T24gSG9sZA==</PHRASE>
-			<PHRASE Label="la_fld_OnSale" Module="In-Commerce" Type="1">UHJvZHVjdCBvbiBTYWxl</PHRASE>
+			<PHRASE Label="la_fld_NumberOfUses" Module="In-Commerce" Type="1" Column="TnVtYmVyIE9mIFVzZXM=">TnVtYmVyIE9mIFVzZXM=</PHRASE>
+			<PHRASE Label="la_fld_OnHold" Module="In-Commerce" Type="1" Column="T24gSG9sZA==">T24gSG9sZA==</PHRASE>
+			<PHRASE Label="la_fld_OnSale" Module="In-Commerce" Type="1" Column="T24gU2FsZQ==">UHJvZHVjdCBvbiBTYWxl</PHRASE>
 			<PHRASE Label="la_fld_OptionPrice" Module="In-Commerce" Type="1">T3B0aW9uIFByaWNl</PHRASE>
 			<PHRASE Label="la_fld_OptionsSelectionMode" Module="In-Commerce" Type="1">T3B0aW9ucyBTZWxlY3Rpb24gTW9kZQ==</PHRASE>
-			<PHRASE Label="la_fld_OptionType" Module="In-Commerce" Type="1">T3B0aW9uIFR5cGU=</PHRASE>
+			<PHRASE Label="la_fld_OptionType" Module="In-Commerce" Type="1" Column="T3B0aW9uIFR5cGU=">T3B0aW9uIFR5cGU=</PHRASE>
 			<PHRASE Label="la_fld_OptionValue" Module="In-Commerce" Type="1">T3B0aW9uIFZhbHVl</PHRASE>
 			<PHRASE Label="la_fld_OptionValues" Module="In-Commerce" Type="1">T3B0aW9uIFZhbHVlcw==</PHRASE>
 			<PHRASE Label="la_fld_OrderId" Module="In-Commerce" Type="1">T3JkZXIgSUQ=</PHRASE>
-			<PHRASE Label="la_fld_OrderIP" Module="In-Commerce" Type="1">SVAgQWRkcmVzcw==</PHRASE>
-			<PHRASE Label="la_fld_OrderNumber" Module="In-Commerce" Type="1">TnVtYmVy</PHRASE>
+			<PHRASE Label="la_fld_OrderIP" Module="In-Commerce" Type="1" Column="SVAgQWRkcmVzcw==">SVAgQWRkcmVzcw==</PHRASE>
+			<PHRASE Label="la_fld_OrderNumber" Module="In-Commerce" Type="1" Column="TnVtYmVy">TnVtYmVy</PHRASE>
 			<PHRASE Label="la_fld_Original" Module="In-Commerce" Type="1">T3JpZ2luYWw=</PHRASE>
 			<PHRASE Label="la_fld_OriginalAmount" Module="In-Commerce" Type="1">T3JpZ2luYWwgQW1vdW50</PHRASE>
 			<PHRASE Label="la_fld_PaymentAccount" Module="In-Commerce" Type="1">UGF5bWVudCBBY2NvdW50</PHRASE>
 			<PHRASE Label="la_fld_PaymentCardType" Module="In-Commerce" Type="1">Q2FyZCBUeXBl</PHRASE>
 			<PHRASE Label="la_fld_PaymentCCExpDate" Module="In-Commerce" Type="1">Q2FyZCBFeHBpcmF0aW9u</PHRASE>
 			<PHRASE Label="la_fld_PaymentCVV2" Module="In-Commerce" Type="1">Q1ZWMg==</PHRASE>
-			<PHRASE Label="la_fld_PaymentDate" Module="In-Commerce" Type="1">UGF5bWVudCBEYXRl</PHRASE>
+			<PHRASE Label="la_fld_PaymentDate" Module="In-Commerce" Type="1" Column="UGF5bWVudCBEYXRl">UGF5bWVudCBEYXRl</PHRASE>
 			<PHRASE Label="la_fld_PaymentExpires" Module="In-Commerce" Type="1">UGF5bWVudCBEYXRlL0V4cGlyYXRpb24=</PHRASE>
 			<PHRASE Label="la_fld_PaymentInterval" Module="In-Commerce" Type="1">UGF5bWVudCBJbnRlcnZhbA==</PHRASE>
 			<PHRASE Label="la_fld_PaymentNameOnCard" Module="In-Commerce" Type="1">TmFtZSBvbiB0aGUgQ2FyZA==</PHRASE>
-			<PHRASE Label="la_fld_PaymentReference" Module="In-Commerce" Type="1">UGF5bWVudCBSZWZlcmVuY2U=</PHRASE>
-			<PHRASE Label="la_fld_PaymentType" Module="In-Commerce" Type="1">UGF5bWVudCBUeXBl</PHRASE>
+			<PHRASE Label="la_fld_PaymentReference" Module="In-Commerce" Type="1" Column="UGF5bWVudCBSZWZlcmVuY2U=">UGF5bWVudCBSZWZlcmVuY2U=</PHRASE>
+			<PHRASE Label="la_fld_PaymentType" Module="In-Commerce" Type="1" Column="UGF5bWVudCBUeXBl">UGF5bWVudCBUeXBl</PHRASE>
 			<PHRASE Label="la_fld_PaymentTypeCurrencies" Module="In-Commerce" Type="1">QXZhaWxhYmxlIEN1cnJlbmNpZXM=</PHRASE>
 			<PHRASE Label="la_fld_PaymentTypeId" Module="In-Commerce" Type="1">UGF5bWVudCBUeXBlIElk</PHRASE>
 			<PHRASE Label="la_fld_PaymentTypes" Module="In-Commerce" Type="1">UGF5bWVudCBUeXBlcw==</PHRASE>
-			<PHRASE Label="la_fld_PercentSurcharge" Module="In-Commerce" Type="1">UGVyY2VudCBTdXJjaGFyZ2U=</PHRASE>
+			<PHRASE Label="la_fld_PercentSurcharge" Module="In-Commerce" Type="1" Column="UGVyY2VudCBTdXJjaGFyZ2U=">UGVyY2VudCBTdXJjaGFyZ2U=</PHRASE>
 			<PHRASE Label="la_fld_Period" Module="In-Commerce" Type="1">UGVyaW9k</PHRASE>
 			<PHRASE Label="la_fld_PlacedOrdersEdit" Module="In-Commerce" Type="1">QWxsb3cgUGxhY2VkIE9yZGVycyBFZGl0aW5n</PHRASE>
-			<PHRASE Label="la_fld_PlanType" Module="In-Commerce" Type="1">UGxhbiBUeXBl</PHRASE>
-			<PHRASE Label="la_fld_Points" Module="In-Commerce" Type="1">UG9pbnRz</PHRASE>
-			<PHRASE Label="la_fld_Price" Module="In-Commerce" Type="1">UHJpY2U=</PHRASE>
+			<PHRASE Label="la_fld_PlanType" Module="In-Commerce" Type="1" Column="UGxhbiBUeXBl">UGxhbiBUeXBl</PHRASE>
+			<PHRASE Label="la_fld_Points" Module="In-Commerce" Type="1" Column="UG9pbnRz">UG9pbnRz</PHRASE>
+			<PHRASE Label="la_fld_Price" Module="In-Commerce" Type="1" Column="UHJpY2U=">UHJpY2U=</PHRASE>
 			<PHRASE Label="la_fld_PriceType" Module="In-Commerce" Type="1">UHJpY2UgTW9kaWZpZXIgVHlwZQ==</PHRASE>
 			<PHRASE Label="la_fld_ProcessingFee" Module="In-Commerce" Type="1">UHJvY2Vzc2luZyBGZWU=</PHRASE>
 			<PHRASE Label="la_fld_ProductFreeShipping" Module="In-Commerce" Type="1">TWluaW11bSBxdWFudGl0eSBmb3IgRnJlZSBTaGlwcGluZw==</PHRASE>
-			<PHRASE Label="la_fld_ProductType" Module="In-Commerce" Type="1">UHJvZHVjdCBUeXBl</PHRASE>
+			<PHRASE Label="la_fld_ProductType" Module="In-Commerce" Type="1" Column="VHlwZQ==">UHJvZHVjdCBUeXBl</PHRASE>
 			<PHRASE Label="la_fld_Product_MaxHotNumber" Module="In-Commerce" Type="1">TWF4aW11bSBudW1iZXIgb2YgVG9wIFNlbGxlciBpdGVtcw==</PHRASE>
 			<PHRASE Label="la_fld_Product_MinPopRating" Module="In-Commerce" Type="1">TWluaW11bSByYXRpbmcgdG8gY29uc2lkZXIgaXRlbSBQT1A=</PHRASE>
 			<PHRASE Label="la_fld_Product_MinPopVotes" Module="In-Commerce" Type="1">TWluaW11bSBudW1iZXIgb2Ygc29sZCBpdGVtcyB0byBjb25zaWRlciBpdGVtIFBPUA==</PHRASE>
-			<PHRASE Label="la_fld_QtyBackOrdered" Module="In-Commerce" Type="1">UXR5IEJhY2tPcmRlcmVk</PHRASE>
-			<PHRASE Label="la_fld_QtyInStock" Module="In-Commerce" Type="1">UXR5IEluIFN0b2Nr</PHRASE>
-			<PHRASE Label="la_fld_QtyInStockMin" Module="In-Commerce" Type="1">TWluaW11bSBxdWFudGl0eSBpbiBzdG9jayB0aHJlc2hvbGQ=</PHRASE>
-			<PHRASE Label="la_fld_QtyOnOrder" Module="In-Commerce" Type="1">UXR5IE9uIE9yZGVy</PHRASE>
-			<PHRASE Label="la_fld_QtyReserved" Module="In-Commerce" Type="1">UXR5IFJlc2VydmVk</PHRASE>
+			<PHRASE Label="la_fld_QtyBackOrdered" Module="In-Commerce" Type="1" Column="QmFja29yZGVyZWQ=">UXR5IEJhY2tPcmRlcmVk</PHRASE>
+			<PHRASE Label="la_fld_QtyInStock" Module="In-Commerce" Type="1" Column="UXR5IEluIFN0b2Nr">UXR5IEluIFN0b2Nr</PHRASE>
+			<PHRASE Label="la_fld_QtyInStockMin" Module="In-Commerce" Type="1" Column="UXR5SW5TdG9ja01pbg==">TWluaW11bSBxdWFudGl0eSBpbiBzdG9jayB0aHJlc2hvbGQ=</PHRASE>
+			<PHRASE Label="la_fld_QtyOnOrder" Module="In-Commerce" Type="1" Column="UXR5IE9uIE9yZGVy">UXR5IE9uIE9yZGVy</PHRASE>
+			<PHRASE Label="la_fld_QtyReserved" Module="In-Commerce" Type="1" Column="UXR5IFJlc2VydmVk">UXR5IFJlc2VydmVk</PHRASE>
 			<PHRASE Label="la_fld_QtySold" Module="In-Commerce" Type="1">UXR5IFNvbGQ=</PHRASE>
-			<PHRASE Label="la_fld_RateToPrimary" Module="In-Commerce" Type="1">UmF0ZSBUbyBQcmltYXJ5</PHRASE>
-			<PHRASE Label="la_fld_RegisteredOn" Module="In-Commerce" Type="1">UmVnaXN0ZXJlZCBPbg==</PHRASE>
-			<PHRASE Label="la_fld_RemainingAmount" Module="In-Commerce" Type="1">UmVtYWluaW5nIEFtb3VudA==</PHRASE>
+			<PHRASE Label="la_fld_RateToPrimary" Module="In-Commerce" Type="1" Column="UmF0ZSBUbyBQcmltYXJ5">UmF0ZSBUbyBQcmltYXJ5</PHRASE>
+			<PHRASE Label="la_fld_RegisteredOn" Module="In-Commerce" Type="1" Column="UmVnaXN0ZXJlZCBPbg==">UmVnaXN0ZXJlZCBPbg==</PHRASE>
+			<PHRASE Label="la_fld_RemainingAmount" Module="In-Commerce" Type="1" Column="UmVtYWluaW5nIEFtb3VudA==">UmVtYWluaW5nIEFtb3VudA==</PHRASE>
 			<PHRASE Label="la_fld_ReportType" Module="In-Commerce" Type="1">UmVwb3J0IFR5cGU=</PHRASE>
 			<PHRASE Label="la_fld_SecondDayDelivery" Module="In-Commerce" Type="1">U2Vjb25kIERheQ==</PHRASE>
 			<PHRASE Label="la_fld_SelectedGroups" Module="In-Commerce" Type="1">U2VsZWN0ZWQgVXNlciBHcm91cHM=</PHRASE>
@@ -418,50 +339,50 @@
 			<PHRASE Label="la_fld_ShippingCompany" Module="In-Commerce" Type="1">U2hpcHBpbmcgQ29tcGFueQ==</PHRASE>
 			<PHRASE Label="la_fld_ShippingControl" Module="In-Commerce" Type="1">U2hpcHBpbmcgQ29udHJvbA==</PHRASE>
 			<PHRASE Label="la_fld_ShippingCost" Module="In-Commerce" Type="1">U2hpcHBpbmcgQ29zdA==</PHRASE>
-			<PHRASE Label="la_fld_ShippingCountry" Module="In-Commerce" Type="1">U2hpcHBpbmcgQ291bnRyeQ==</PHRASE>
+			<PHRASE Label="la_fld_ShippingCountry" Module="In-Commerce" Type="1" Column="U2hpcHBpbmcgQ291bnRyeQ==">U2hpcHBpbmcgQ291bnRyeQ==</PHRASE>
 			<PHRASE Label="la_fld_ShippingCustomerAccount" Module="In-Commerce" Type="1">U2hpcHBpbmcgQ3VzdG9tZXIgQWNjb3VudA==</PHRASE>
 			<PHRASE Label="la_fld_ShippingDate" Module="In-Commerce" Type="1">U2hpcHBpbmcgRGF0ZS9UaW1l</PHRASE>
 			<PHRASE Label="la_fld_ShippingEmail" Module="In-Commerce" Type="1">U2hpcHBpbmcgRW1haWw=</PHRASE>
 			<PHRASE Label="la_fld_ShippingFax" Module="In-Commerce" Type="1">U2hpcHBpbmcgRmF4</PHRASE>
 			<PHRASE Label="la_fld_ShippingMode" Module="In-Commerce" Type="1">QWxsb3dlZCBTaGlwcGluZyBUeXBlcw==</PHRASE>
-			<PHRASE Label="la_fld_ShippingName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
+			<PHRASE Label="la_fld_ShippingName" Module="In-Commerce" Type="1" Column="TmFtZQ==">TmFtZQ==</PHRASE>
 			<PHRASE Label="la_fld_ShippingOption" Module="In-Commerce" Type="1">U2hpcHBpbmcgT3B0aW9u</PHRASE>
 			<PHRASE Label="la_fld_ShippingOptions" Module="In-Commerce" Type="1">U2hpcHBpbmcgT3B0aW9ucw==</PHRASE>
 			<PHRASE Label="la_fld_ShippingPhone" Module="In-Commerce" Type="1">U2hpcHBpbmcgUGhvbmU=</PHRASE>
-			<PHRASE Label="la_fld_ShippingQuoteEngineName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
+			<PHRASE Label="la_fld_ShippingQuoteEngineName" Module="In-Commerce" Type="1" Column="TmFtZQ==">TmFtZQ==</PHRASE>
 			<PHRASE Label="la_fld_ShippingState" Module="In-Commerce" Type="1">U2hpcHBpbmcgU3RhdGU=</PHRASE>
 			<PHRASE Label="la_fld_ShippingTo" Module="In-Commerce" Type="1">U2hpcHBpbmcgVG8=</PHRASE>
 			<PHRASE Label="la_fld_ShippingTracking" Module="In-Commerce" Type="1">U2hpcHBpbmcgVHJhY2tpbmcvUmVmZXJlbmNl</PHRASE>
-			<PHRASE Label="la_fld_ShippingType" Module="In-Commerce" Type="1">U2hpcHBpbmcgVHlwZQ==</PHRASE>
+			<PHRASE Label="la_fld_ShippingType" Module="In-Commerce" Type="1" Column="VHlwZQ==">U2hpcHBpbmcgVHlwZQ==</PHRASE>
 			<PHRASE Label="la_fld_ShippingTypeId" Module="In-Commerce" Type="1">U2hpcHBpbmcgVHlwZSBJRA==</PHRASE>
 			<PHRASE Label="la_fld_ShippingTypes" Module="In-Commerce" Type="1">U2hpcHBpbmcgVHlwZXM=</PHRASE>
 			<PHRASE Label="la_fld_ShippingZip" Module="In-Commerce" Type="1">U2hpcHBpbmcgWmlwY29kZQ==</PHRASE>
-			<PHRASE Label="la_fld_ShipZoneName" Module="In-Commerce" Type="1">U2hpcHBpbmcgWm9uZSBOYW1l</PHRASE>
-			<PHRASE Label="la_fld_SKU" Module="In-Commerce" Type="1">U0tV</PHRASE>
-			<PHRASE Label="la_fld_SpeedCode" Module="In-Commerce" Type="1">U3BlZWQgQ29kZQ==</PHRASE>
+			<PHRASE Label="la_fld_ShipZoneName" Module="In-Commerce" Type="1" Column="U2hpcHBpbmcgWm9uZSBOYW1l">U2hpcHBpbmcgWm9uZSBOYW1l</PHRASE>
+			<PHRASE Label="la_fld_SKU" Module="In-Commerce" Type="1" Column="U0tV">U0tV</PHRASE>
+			<PHRASE Label="la_fld_SpeedCode" Module="In-Commerce" Type="1" Column="U2hpcHBpbmcgU3BlZWQ=">U3BlZWQgQ29kZQ==</PHRASE>
 			<PHRASE Label="la_fld_SSN" Module="In-Commerce" Type="1">U1NOL1RheCBJZC9WQVQgTnVtYmVy</PHRASE>
-			<PHRASE Label="la_fld_Start" Module="In-Commerce" Type="1">U3RhcnQgRGF0ZQ==</PHRASE>
+			<PHRASE Label="la_fld_Start" Module="In-Commerce" Type="1" Column="U3RhcnQ=">U3RhcnQgRGF0ZQ==</PHRASE>
 			<PHRASE Label="la_fld_SubTotal" Module="In-Commerce" Type="1">U3VidG90YWw=</PHRASE>
-			<PHRASE Label="la_fld_TaxApplyToProcessing" Module="In-Commerce" Type="1">QXBwbHkgdG8gUHJvY2Vzc2luZw==</PHRASE>
-			<PHRASE Label="la_fld_TaxApplyToShipping" Module="In-Commerce" Type="1">QXBwbHkgdG8gU2hpcHBpbmc=</PHRASE>
-			<PHRASE Label="la_fld_TaxValue" Module="In-Commerce" Type="1">VGF4IFZhbHVl</PHRASE>
-			<PHRASE Label="la_fld_TaxZoneName" Module="In-Commerce" Type="1">TmFtZSBvZiBUYXggWm9uZQ==</PHRASE>
+			<PHRASE Label="la_fld_TaxApplyToProcessing" Module="In-Commerce" Type="1" Column="QXBwbHkgdG8gUHJvY2Vzc2luZw==">QXBwbHkgdG8gUHJvY2Vzc2luZw==</PHRASE>
+			<PHRASE Label="la_fld_TaxApplyToShipping" Module="In-Commerce" Type="1" Column="QXBwbHkgdG8gU2hpcHBpbmc=">QXBwbHkgdG8gU2hpcHBpbmc=</PHRASE>
+			<PHRASE Label="la_fld_TaxValue" Module="In-Commerce" Type="1" Column="VGF4IFZhbHVl">VGF4IFZhbHVl</PHRASE>
+			<PHRASE Label="la_fld_TaxZoneName" Module="In-Commerce" Type="1" Column="VGF4IFpvbmUgTmFtZQ==">TmFtZSBvZiBUYXggWm9uZQ==</PHRASE>
 			<PHRASE Label="la_fld_ThirdDayDelivery" Module="In-Commerce" Type="1">VGhpcmQgRGF5</PHRASE>
 			<PHRASE Label="la_fld_Time" Module="In-Commerce" Type="1">VGltZQ==</PHRASE>
-			<PHRASE Label="la_fld_ToAmount" Module="In-Commerce" Type="1">VG8gQW1vdW50</PHRASE>
+			<PHRASE Label="la_fld_ToAmount" Module="In-Commerce" Type="1" Column="VG8gQW1vdW50">VG8gQW1vdW50</PHRASE>
 			<PHRASE Label="la_fld_ToDateTime" Module="In-Commerce" Type="1">VG8gZGF0ZS90aW1l</PHRASE>
 			<PHRASE Label="la_fld_TopSeller" Module="In-Commerce" Type="1">VG9wIFNlbGxlcg==</PHRASE>
-			<PHRASE Label="la_fld_TotalAmount" Module="In-Commerce" Type="1">VG90YWwgQW1vdW50</PHRASE>
+			<PHRASE Label="la_fld_TotalAmount" Module="In-Commerce" Type="1" Column="VG90YWwgQW1vdW50">VG90YWwgQW1vdW50</PHRASE>
 			<PHRASE Label="la_fld_TotalReturns" Module="In-Commerce" Type="1">VG90YWwgUmV0dXJucw==</PHRASE>
 			<PHRASE Label="la_fld_TotalSavings" Module="In-Commerce" Type="1">VG90YWwgU2F2aW5ncw==</PHRASE>
-			<PHRASE Label="la_fld_UnitsLimit" Module="In-Commerce" Type="1">TGluaXQ=</PHRASE>
+			<PHRASE Label="la_fld_UnitsLimit" Module="In-Commerce" Type="1" Column="TGltaXQ=">TGluaXQ=</PHRASE>
 			<PHRASE Label="la_fld_UserComment" Module="In-Commerce" Type="1">VXNlciBDb21tZW50</PHRASE>
 			<PHRASE Label="la_fld_VAT" Module="In-Commerce" Type="1">U2FsZXMgVGF4L1ZBVA==</PHRASE>
 			<PHRASE Label="la_fld_VerificationResult" Module="In-Commerce" Type="1">VmVyaWZpY2F0aW9uIFJlc3VsdA==</PHRASE>
-			<PHRASE Label="la_fld_Weight" Module="In-Commerce" Type="1">V2VpZ2h0</PHRASE>
+			<PHRASE Label="la_fld_Weight" Module="In-Commerce" Type="1" Column="V2VpZ2h0">V2VpZ2h0</PHRASE>
 			<PHRASE Label="la_fld_WeightType" Module="In-Commerce" Type="1">V2VpZ2h0IE1vZGlmaWVyIFR5cGU=</PHRASE>
-			<PHRASE Label="la_fld_ZoneName" Module="In-Commerce" Type="1">Wm9uZSBOYW1l</PHRASE>
-			<PHRASE Label="la_fld_ZoneType" Module="In-Commerce" Type="1">VHlwZQ==</PHRASE>
+			<PHRASE Label="la_fld_ZoneName" Module="In-Commerce" Type="1" Column="Wm9uZSBOYW1l">Wm9uZSBOYW1l</PHRASE>
+			<PHRASE Label="la_fld_ZoneType" Module="In-Commerce" Type="1" Column="Wm9uZSBUeXBl">VHlwZQ==</PHRASE>
 			<PHRASE Label="la_fld_Zone_Type" Module="In-Commerce" Type="1">VHlwZQ==</PHRASE>
 			<PHRASE Label="la_FontColor" Module="In-Commerce" Type="1">Rm9udCBDb2xvcg==</PHRASE>
 			<PHRASE Label="la_FreeShipping" Module="In-Commerce" Type="1">RnJlZSBTaGlwcGluZw==</PHRASE>
Index: branches/5.1.x/units/coupons/coupons_config.php
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/units/coupons/coupons_config.php	(.../coupons_config.php)	(revision 14257)
+++ branches/5.1.x/units/coupons/coupons_config.php	(.../coupons_config.php)	(revision 14534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: coupons_config.php 14257 2011-03-16 21:41:19Z alex $
+* @version	$Id: coupons_config.php 14534 2011-09-18 14:13:17Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -149,16 +149,16 @@
 										'module' => 'core',
 									),
 															'Fields' => Array(
-																		'CouponId'	=> Array ('title'=>'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
-																		'Name' => Array( 'title'=>'la_col_Name', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
-																		'Code' => Array( 'title'=>'la_col_CouponCode', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
-																		'Expiration' => Array( 'title'=>'la_col_Expiration', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
-																		'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
-																		'Status' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
-																		'Amount' => Array( 'title'=>'la_col_Amount', 'filter_block' => 'grid_float_range_filter', 'width' => 100, ),
-																		'LastUsedBy' => Array('title'=>'la_col_LastUsedBy', 'filter_block' => 'grid_like_filter', 'width' => 140, ),
-																		'LastUsedOn' => Array('title'=>'la_col_LastUsedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
-																		'NumberOfUses' => Array('title'=>'la_col_NumberOfUses', 'filter_block' => 'grid_range_filter', 'width' => 130, ),
+																		'CouponId'	=> Array ('title'=>'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+																		'Name' => Array('filter_block' => 'grid_like_filter', 'width' => 150, ),
+																		'Code' => Array('title'=>'column:la_fld_CouponCode', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+																		'Expiration' => Array('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+																		'Type' => Array('filter_block' => 'grid_options_filter', 'width' => 100, ),
+																		'Status' => Array('filter_block' => 'grid_options_filter', 'width' => 100, ),
+																		'Amount' => Array('filter_block' => 'grid_float_range_filter', 'width' => 100, ),
+																		'LastUsedBy' => Array('filter_block' => 'grid_like_filter', 'width' => 140, ),
+																		'LastUsedOn' => Array('filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+																		'NumberOfUses' => Array('filter_block' => 'grid_range_filter', 'width' => 130, ),
 																		),
 													),
 								'Radio'		=>	Array(
@@ -169,17 +169,18 @@
 										2 => 'icon16_pending.png',
 										'module' => 'core',
 									),
+									'Selector' => 'radio',
 														'Fields' => Array(
-																		'CouponId'	=> Array ('title'=>'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
-																		'Name' => Array( 'title'=>'la_col_Name', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
-																		'Code' => Array( 'title'=>'la_col_CouponCode', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
-																		'Expiration' => Array( 'title'=>'la_col_Expiration', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
-																		'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
-																		'Status' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
-																		'Amount' => Array( 'title'=>'la_col_Amount', 'filter_block' => 'grid_float_range_filter', 'width' => 100, ),
-																		'LastUsedBy' => Array('title'=>'la_col_LastUsedBy', 'filter_block' => 'grid_like_filter', 'width' => 140, ),
-																		'LastUsedOn' => Array('title'=>'la_col_LastUsedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ),
-																		'NumberOfUses' => Array('title'=>'la_col_NumberOfUses', 'filter_block' => 'grid_range_filter', 'width' => 130, ),
+																		'CouponId'	=> Array ('title'=>'column:la_fld_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+																		'Name' => Array('filter_block' => 'grid_like_filter', 'width' => 150, ),
+																		'Code' => Array('title'=>'column:la_fld_CouponCode', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+																		'Expiration' => Array('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+																		'Type' => Array('filter_block' => 'grid_options_filter', 'width' => 100, ),
+																		'Status' => Array('filter_block' => 'grid_options_filter', 'width' => 100, ),
+																		'Amount' => Array('filter_block' => 'grid_float_range_filter', 'width' => 100, ),
+																		'LastUsedBy' => Array('filter_block' => 'grid_like_filter', 'width' => 140, ),
+																		'LastUsedOn' => Array('filter_block' => 'grid_date_range_filter', 'width' => 140, ),
+																		'NumberOfUses' => Array('filter_block' => 'grid_range_filter', 'width' => 130, ),
 																	),
 												),
 								),
Index: branches/5.1.x/admin_templates/shipping/shipping_brackets.tpl
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/admin_templates/shipping/shipping_brackets.tpl	(.../shipping_brackets.tpl)	(revision 14257)
+++ branches/5.1.x/admin_templates/shipping/shipping_brackets.tpl	(.../shipping_brackets.tpl)	(revision 14534)
@@ -254,8 +254,8 @@
 <div id="scroll_container">
 	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
 		<tr nowrap="nowrap" class="grid-header-row-0">
-			<inp2:m_RenderElement name="br_grid_th" phrase="la_col_Start"/>
-			<inp2:m_RenderElement name="br_grid_th" phrase="la_col_End"/>
+			<inp2:m_RenderElement name="br_grid_th" phrase="column:la_fld_Start"/>
+			<inp2:m_RenderElement name="br_grid_th" phrase="column:la_fld_End"/>
 		</tr>
 		<inp2:br_ShowBracketsForm block="bracket" IdField="BracketId"/>
 	</table>
Index: branches/5.1.x/units/downloads/downloads_config.php
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/units/downloads/downloads_config.php	(.../downloads_config.php)	(revision 14257)
+++ branches/5.1.x/units/downloads/downloads_config.php	(.../downloads_config.php)	(revision 14534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: downloads_config.php 14257 2011-03-16 21:41:19Z alex $
+* @version	$Id: downloads_config.php 14534 2011-09-18 14:13:17Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -101,11 +101,11 @@
 								'module' => 'core',
 							),
 							'Fields' => Array(
-								'DownloadId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
-								'Username' => Array( 'title'=>'la_col_Username', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
+								'DownloadId' => Array( 'title'=>'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+								'Username' => Array( 'filter_block' => 'grid_like_filter', 'width' => 100, ),
 								'ProductName' => Array( 'title'=>'la_col_DownloadedProductName', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
 								'Filename' => Array( 'title'=>'la_col_DownloadedFileName', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
-								'IPAddress' => Array( 'title'=>'la_col_IPAddress', 'filter_block' => 'grid_like_filter', 'width' => 150, ),
+								'IPAddress' => Array( 'filter_block' => 'grid_like_filter', 'width' => 150, ),
 								'StartedOn' => Array( 'title'=>'la_col_StartedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),
 							),
 						),
Index: branches/5.1.x/units/gift_certificates/gift_certificates_config.php
===================================================================
diff -u -r14257 -r14534
--- branches/5.1.x/units/gift_certificates/gift_certificates_config.php	(.../gift_certificates_config.php)	(revision 14257)
+++ branches/5.1.x/units/gift_certificates/gift_certificates_config.php	(.../gift_certificates_config.php)	(revision 14534)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: gift_certificates_config.php 14257 2011-03-16 21:41:19Z alex $
+* @version	$Id: gift_certificates_config.php 14534 2011-09-18 14:13:17Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -70,7 +70,7 @@
 				'priority'		=>	3.3, // <parent_priority>.<own_priority>, because this section replaces parent in tree
 				'type'			=>	stTAB,
 			),
-		),		
+		),
 
 		'ListSQLs' => Array ('' => 'SELECT %1$s.* %2$s FROM %1$s',),
 		'ItemSQLs' => Array ('' => 'SELECT * FROM %1$s',),
@@ -126,12 +126,12 @@
 					'module' => 'core',
 				),
 				'Fields' => Array (
-					'GiftCertificateId'	=> Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
-					'Code' => Array ('title' => 'la_col_Code', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
-					'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
-					'Debit' => Array ('title' => 'la_col_RemainingAmount', 'filter_block' => 'grid_float_range_filter', 'width' => 160, ),
-					'Amount' => Array ('title' => 'la_col_Amount', 'filter_block' => 'grid_float_range_filter', 'width' => 100, ),
-					'Expiration' => Array ('title'=>'la_col_Expiration', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
+					'GiftCertificateId'	=> Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+					'Code' => Array ('filter_block' => 'grid_like_filter', 'width' => 100, ),
+					'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
+					'Debit' => Array ('title' => 'column:la_fld_RemainingAmount', 'filter_block' => 'grid_float_range_filter', 'width' => 160, ),
+					'Amount' => Array ('filter_block' => 'grid_float_range_filter', 'width' => 100, ),
+					'Expiration' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ),
 				),
 			),
 		),