Index: branches/5.2.x/units/taxes/taxes_config.php
===================================================================
diff -u -N -r14569 -r14582
--- branches/5.2.x/units/taxes/taxes_config.php	(.../taxes_config.php)	(revision 14569)
+++ branches/5.2.x/units/taxes/taxes_config.php	(.../taxes_config.php)	(revision 14582)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: taxes_config.php 14569 2011-09-20 10:30:56Z alex $
+* @version	$Id: taxes_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
@@ -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, ),
 							),
 						),
 					),