Index: branches/5.2.x/units/shipping/shipping_config.php
===================================================================
diff -u -N -r14258 -r14582
--- branches/5.2.x/units/shipping/shipping_config.php	(.../shipping_config.php)	(revision 14258)
+++ branches/5.2.x/units/shipping/shipping_config.php	(.../shipping_config.php)	(revision 14582)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: shipping_config.php 14258 2011-03-16 21:43:52Z alex $
+* @version	$Id: shipping_config.php 14582 2011-09-23 14:42:51Z 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')),
@@ -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'),
 																			),
 
 																),