Index: branches/5.2.x/units/shipping/shipping_config.php
===================================================================
diff -u -N -r13845 -r14089
--- branches/5.2.x/units/shipping/shipping_config.php	(.../shipping_config.php)	(revision 13845)
+++ branches/5.2.x/units/shipping/shipping_config.php	(.../shipping_config.php)	(revision 14089)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: shipping_config.php 13549 2010-05-11 21:03:39Z alex $
+* @version	$Id: shipping_config.php 14089 2010-11-26 22:16:00Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -50,25 +50,36 @@
 					'StatusField'		=>	Array ('Status'),
 					'TitleField'		=>  'Name',
 
-					'TitlePresets'		=>	Array (
-												'default'	=>	Array (	'new_status_labels'		=> Array ('s' => '!la_title_AddingShippingType!'),
-																		'edit_status_labels'	=> Array ('s' => '!la_title_EditingShippingType!'),
-																		'new_titlefield'		=> Array ('s' => '!la_title_NewShippingType!'),
-																),
-												'shipping_list' =>Array (		'prefixes'				=> Array ('s_List'),
-																			'format'				=>	"!la_title_ShippingTypes!",
-																),
-												'shipping_type_edit' =>Array (	'prefixes'				=> Array ('s'),
-																				'format'				=> "#s_status# '#s_titlefield#' - !la_title_General!",
-																),
+					'TitlePresets' => Array (
+						'default' => Array (
+							'new_status_labels' => Array ('s' => '!la_title_AddingShippingType!'),
+							'edit_status_labels' => Array ('s' => '!la_title_EditingShippingType!'),
+							'new_titlefield' => Array ('s' => '!la_title_NewShippingType!'),
+						),
+						'shipping_list' => Array (
+							'prefixes' => Array ('s_List'),
+							'format' => "!la_title_ShippingTypes!",
+						),
+						'shipping_type_edit' => Array (
+							'prefixes' => Array ('s'),
+							'format' => "#s_status# '#s_titlefield#' - !la_title_General!",
+						),
+						'zones' => Array (
+							'prefixes' => Array ('s'),
+							'format' => "#s_status# '#s_titlefield#' - !la_title_Zones!",
+						),
+						'zones_edit' =>	Array (
+							'prefixes' => Array ('z'),
+							'new_status_labels' => Array ('z' => '!la_title_AddingShippingZone!'),
+							'edit_status_labels' =>	Array ('z' => '!la_title_EditingShippingZone!'),
+							'format' => "#z_status# '#z_titlefield#'",
+						),
+						'brackets' => Array ('prefixes' => Array ('s'), 'format' => "#s_status# '#s_titlefield#' - !la_title_Brackets!",),
+						'costs' => Array ('prefixes' => Array ('s'), 'format' => "#s_status# '#s_titlefield#' - !la_title_Costs!",),
+						'groups' => Array ('prefixes' => Array ('s'), 'format' => "#s_status# '#s_titlefield#' - !la_title_Groups!",),
+						'select_modifier' => Array ('prefixes' => Array ('s'), 'format' => "!la_title_ApplyModifier!",),
+					),
 
-												'zones'		=>	Array ('prefixes' => Array ('s'), 'format' => "#s_status# '#s_titlefield#' - !la_title_Zones!"),
-												'brackets'	=>	Array ('prefixes' => Array ('s'), 'format' => "#s_status# '#s_titlefield#' - !la_title_Brackets!"),
-												'costs'	=>	Array ('prefixes' => Array ('s'), 'format' => "#s_status# '#s_titlefield#' - !la_title_Costs!"),
-												'groups'	=>	Array ('prefixes' => Array ('s'), 'format' => "#s_status# '#s_titlefield#' - !la_title_Groups!"),
-												'select_modifier'	=>	Array ('prefixes' => Array ('s'), 'format' => "!la_title_ApplyModifier!"),
-											),
-
 					'EditTabPresets' => Array (
 						'Default' => Array (
 							'general' => Array ('title' => 'la_tab_General', 't' => 'in-commerce/shipping/shipping_edit', 'priority' => 1),
@@ -107,25 +118,16 @@
 
 					'SubItems'	=> Array ('z', 'br'),
 
-					'FilterMenu'		=>	Array (
-												'Groups' => Array (
-													Array ('mode' => 'AND', 'filters' => Array ('show_active', 'show_disabled'), 'type' => WHERE_FILTER),
-												),
-												'Filters' => Array (
-													'show_active'	=>	Array ('label' => 'la_Active', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ),
-													'show_disabled'	=>	Array ('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0'  ),
-												)
-											),
-
 					'ListSQLs'			=>	Array (	'' =>	'SELECT * FROM %s'),
 																		 // key - special, value - list select sql
 					'ItemSQLs'			=>	Array (	'' =>	'SELECT * FROM %s'),
 
 					'ListSortings'	=> 	Array (
-																'' => Array (
-																	'Sorting' => Array ('Name' => 'asc'),
-																)
-															),
+						'' => Array (
+							'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')),