Index: branches/5.1.x/units/orders/orders_config.php
===================================================================
diff -u -N -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'),
 							),
 						),
 					),