Index: branches/5.1.x/admin_templates/products/products_packagecontent.tpl
===================================================================
diff -u -r13100 -r13938
--- branches/5.1.x/admin_templates/products/products_packagecontent.tpl	(.../products_packagecontent.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/products/products_packagecontent.tpl	(.../products_packagecontent.tpl)	(revision 13938)
@@ -84,7 +84,7 @@
 	<inp2:Field field="QtyInStock" grid="$grid"/>/<inp2:Field field="QtyReserved" grid="$grid"/>
 </inp2:m_DefineElement>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="p.content" IdField="ProductId" grid="Default" menu_filters="yes" types="content"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="p.content" IdField="ProductId" grid="Default" types="content"/>
 <input type="hidden" name="TargetId" id="TargetId" value="<inp2:m_get name="TargetId"/>">
 <input type="hidden" name="TargetType" id="TargetType" value="<inp2:m_get name="TargetType"/>">
 <input type="hidden" name="main_prefix" id="main_prefix" value="p">
Index: branches/5.1.x/admin_templates/products/option_combinations.tpl
===================================================================
diff -u -r13100 -r13938
--- branches/5.1.x/admin_templates/products/option_combinations.tpl	(.../option_combinations.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/products/option_combinations.tpl	(.../option_combinations.tpl)	(revision 13938)
@@ -153,7 +153,7 @@
 	</table>
 </div>
 
-<inp2:m_RenderElement name="grid" main_special="" PrefixSpecial="poc.grid" IdField="CombinationId" grid="Default" menu_filters="yes"/>
+<inp2:m_RenderElement name="grid" main_special="" PrefixSpecial="poc.grid" IdField="CombinationId" grid="Default"/>
 <script type="text/javascript">
 	Grids['poc.grid'].SetDependantToolbarButtons( new Array('delete', 'move_up', 'move_down') );
 </script>
Index: branches/5.1.x/units/files/files_config.php
===================================================================
diff -u -r13549 -r13938
--- branches/5.1.x/units/files/files_config.php	(.../files_config.php)	(revision 13549)
+++ branches/5.1.x/units/files/files_config.php	(.../files_config.php)	(revision 13938)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: files_config.php 13549 2010-05-11 21:03:39Z alex $
+* @version	$Id: files_config.php 13938 2010-09-14 09:12:39Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -56,25 +56,21 @@
 					'AutoDelete'	=>	true,
 					'AutoClone'	=> true,
 
-					'ListSQLs'			=>	Array (	'' => 'SELECT * FROM %s',
-																		), // key - special, value - list select sql
-					'ItemSQLs'			=>	Array (	'' => 'SELECT * FROM %s',
-																		),
-					'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 (
-																	'ForcedSorting' => Array ('IsPrimary' => 'desc', 'Priority' => 'desc'),
-																	'Sorting' => Array ('AddedOn' => 'desc', 'Version' => 'desc'),
-																)
-															),
+						'' => Array (
+							'ForcedSorting' => Array ('IsPrimary' => 'desc', 'Priority' => 'desc'),
+							'Sorting' => Array ('AddedOn' => 'desc', 'Version' => 'desc'),
+						)
+					),
+
 					'Fields' =>	Array (
 					    'FileId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,),
 			            'ProductId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,),
@@ -87,8 +83,8 @@
 			            	'upload_dir' => ITEM_FILES_PATH, 'include_path' => 0,
 			            	'size_field' => 'Size', 'max_size' => 50000000,
 			            	'orig_name_field' => 'FilePath',
-			            	'content_type_field' => 'MIMEType',			            	
-							'not_null' => 1, 'skip_empty' =>1, 'default' => '', 
+			            	'content_type_field' => 'MIMEType',
+							'not_null' => 1, 'skip_empty' =>1, 'default' => '',
 							'error_msgs' => Array (
 								'bad_file_format' => '!la_error_InvalidFileFormat!',
 								'bad_file_size' 	=> '!la_error_FileTooLarge!',
@@ -102,24 +98,24 @@
 						),
 			            '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),
 			            'AddedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
 			            'AddedById' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 			            'MIMEType' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''),
 					),
-					
+
 					'VirtualFields'	=> 	Array (
-						
+
 					),
 
 					'Grids'	=> Array (
@@ -140,6 +136,7 @@
 																			'Version' => Array ( 'title' => 'la_col_Version', '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'),
 																		),
 														),
 							),
Index: branches/5.1.x/admin_templates/orders/orders_search_list.tpl
===================================================================
diff -u -r13100 -r13938
--- branches/5.1.x/admin_templates/orders/orders_search_list.tpl	(.../orders_search_list.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/orders/orders_search_list.tpl	(.../orders_search_list.tpl)	(revision 13938)
@@ -53,7 +53,7 @@
 </tbody>
 </table>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="ord.search" IdField="OrderId" grid="Search" menu_filters="yes"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="ord.search" IdField="OrderId" grid="Search"/>
 
 <script type="text/javascript">
 	Grids['ord.search'].SetDependantToolbarButtons( new Array('edit','delete','print','goto_order','archive') );
Index: branches/5.1.x/admin_templates/products/products_images.tpl
===================================================================
diff -u -r13100 -r13938
--- branches/5.1.x/admin_templates/products/products_images.tpl	(.../products_images.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/products/products_images.tpl	(.../products_images.tpl)	(revision 13938)
@@ -99,7 +99,7 @@
 </tbody>
 </table>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="img" IdField="ImageId" grid="Default" menu_filters="yes"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="img" IdField="ImageId" grid="Default"/>
 <script type="text/javascript">
 	Grids['img'].SetDependantToolbarButtons( new Array('edit','delete','move_up','move_down','setprimary') );
 </script>
Index: branches/5.1.x/admin_templates/discounts/discounts_list.tpl
===================================================================
diff -u -r13100 -r13938
--- branches/5.1.x/admin_templates/discounts/discounts_list.tpl	(.../discounts_list.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/discounts/discounts_list.tpl	(.../discounts_list.tpl)	(revision 13938)
@@ -53,7 +53,7 @@
 </tbody>
 </table>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="d" IdField="DiscountId" grid="Default" menu_filters="yes"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="d" IdField="DiscountId" grid="Default"/>
 <script type="text/javascript">
 	Grids['d'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline') );
 </script>
Index: branches/5.1.x/admin_templates/products/products_relations.tpl
===================================================================
diff -u -r13100 -r13938
--- branches/5.1.x/admin_templates/products/products_relations.tpl	(.../products_relations.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/products/products_relations.tpl	(.../products_relations.tpl)	(revision 13938)
@@ -92,7 +92,7 @@
 </tbody>
 </table>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="rel" IdField="RelationshipId" grid="Default" menu_filters="yes"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="rel" IdField="RelationshipId" grid="Default"/>
 <script type="text/javascript">
 	Grids['rel'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline') );
 </script>
Index: branches/5.1.x/admin_templates/discounts/coupons_list.tpl
===================================================================
diff -u -r13100 -r13938
--- branches/5.1.x/admin_templates/discounts/coupons_list.tpl	(.../coupons_list.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/discounts/coupons_list.tpl	(.../coupons_list.tpl)	(revision 13938)
@@ -59,7 +59,7 @@
 </tbody>
 </table>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="coup" IdField="CouponId" grid="Default" menu_filters="yes"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="coup" IdField="CouponId" grid="Default"/>
 <script type="text/javascript">
 	Grids['coup'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','clone') );
 </script>
Index: branches/5.1.x/admin_templates/products/products_reviews.tpl
===================================================================
diff -u -r13100 -r13938
--- branches/5.1.x/admin_templates/products/products_reviews.tpl	(.../products_reviews.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/products/products_reviews.tpl	(.../products_reviews.tpl)	(revision 13938)
@@ -107,7 +107,7 @@
 	<inp2:Field field="$field" no_special="no_special" cut_first="100"/>
 </inp2:m_DefineElement>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="rev" IdField="ReviewId" grid="Default" menu_filters="yes"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="rev" IdField="ReviewId" grid="Default"/>
 <script type="text/javascript">
 	Grids['rev'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','move_up','move_down') );
 </script>
Index: branches/5.1.x/admin_templates/shipping/shipping_list.tpl
===================================================================
diff -u -r13100 -r13938
--- branches/5.1.x/admin_templates/shipping/shipping_list.tpl	(.../shipping_list.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/shipping/shipping_list.tpl	(.../shipping_list.tpl)	(revision 13938)
@@ -45,7 +45,7 @@
 </tbody>
 </table>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="sqe" IdField="EngineId" grid="Default" menu_filters="yes"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="sqe" IdField="EngineId" grid="Default"/>
 <script type="text/javascript">
 	Grids['sqe'].SetDependantToolbarButtons( new Array('edit','approve','decline') );
 </script>
Index: branches/5.1.x/units/discounts/discounts_config.php
===================================================================
diff -u -r13156 -r13938
--- branches/5.1.x/units/discounts/discounts_config.php	(.../discounts_config.php)	(revision 13156)
+++ branches/5.1.x/units/discounts/discounts_config.php	(.../discounts_config.php)	(revision 13938)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: discounts_config.php 13156 2010-02-23 20:11:38Z alex $
+* @version	$Id: discounts_config.php 13938 2010-09-14 09:12:39Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -85,22 +85,6 @@
 						),
 					),
 
-					'FilterMenu'		=>	Array(
-												'Groups' => Array(
-													Array('mode' => 'AND', 'filters' => Array(0,1,2), 'type' => WHERE_FILTER),
-													Array('mode' => 'AND', 'filters' => Array(4,5,6), 'type' => WHERE_FILTER),
-												),
-												'Filters' => Array(
-													0	=>	Array('label' =>'la_Active', 'on_sql' => '', 'off_sql' => 'Status != 1' ),
-													1	=>	Array('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => 'Status != 2'  ),
-													2	=>	Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => 'Status != 0'  ),
-													3	=>	Array(),
-													4	=>	Array('label' => 'la_Flat', 'on_sql' => '', 'off_sql' => 'Type != 1'  ),
-													5	=>	Array('label' => 'la_Percent', 'on_sql' => '', 'off_sql' => 'Type != 2'  ),
-													6	=>	Array('label' => 'la_FreeShipping', 'on_sql' => '', 'off_sql' => 'Type != 3'  ),
-												)
-											),
-
 					'ListSQLs'			=>	Array(	''=>'SELECT %1$s.* %2$s FROM %1$s',
 																		), // key - special, value - list select sql
 					'ItemSQLs'			=>	Array(	''=>'SELECT * FROM %1$s',
@@ -111,41 +95,47 @@
 																	'Sorting' => Array('Name' => 'asc'),
 																)
 															),
-					'Fields'			=>	Array(
-											    'DiscountId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
-											    'Status' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array ( 1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled' ), 'use_phrases' => 1, 'default' => 2 ),
-											    'Name' => Array('type'=>'string','required' => 1, 'default' => null, 'max_len'=>255),
-											    'Start' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
-											    'End' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null),
-											    'GroupId' => Array(
-											    	'type' => 'int',
-											    	'formatter'=>'kOptionsFormatter', 'options_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalGroup WHERE Personal = 0 ORDER BY Name', 'option_key_field'=>'GroupId', 'option_title_field'=>'Name',
-											    	'required' => 1, 'default' => NULL
-											    ),
-											    'Type' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array ( 1 => 'la_Flat', 2 => 'la_Percent'/*, 3 => 'la_FreeShipping'  */), 'default' => 1 ),
-											    'Amount' => Array('type'=>'double', 'default' => null),
+					'Fields' =>	Array (
+					    'DiscountId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
+					    'Status' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array ( 1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled' ), 'use_phrases' => 1, 'default' => 2 ),
+					    'Name' => Array('type'=>'string','required' => 1, 'default' => null, 'max_len'=>255),
+					    'Start' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
+					    'End' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null),
+					    'GroupId' => Array(
+					    	'type' => 'int',
+					    	'formatter'=>'kOptionsFormatter', 'options_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalGroup WHERE Personal = 0 ORDER BY Name', 'option_key_field'=>'GroupId', 'option_title_field'=>'Name',
+					    	'required' => 1, 'default' => NULL
+					    ),
+					    'Type' => Array(
+					    	'type' => 'int',
+					    	'formatter' => 'kOptionsFormatter',
+					    	'options' => Array (
+					    		1 => 'la_Flat', 2 => 'la_Percent'/*, 3 => 'la_FreeShipping'  */
+					    	),
+					    	'use_phrases' => 1, 'default' => 1,
+					    ),
+					    'Amount' => Array('type'=>'double', 'default' => null),
+					),
 
-											),
-
-					'Grids'	=> Array(
-								'Default'		=>	Array(
-									'Icons' => Array(
-										'default' => 'icon16_item.png',
-										0 => 'icon16_disabled.png',
-										1 => 'icon16_item.png',
-										2 => 'icon16_pending.png',
-										'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, ),
-																			'Amount' => Array( 'title'=>'la_col_Amount', 'filter_block' => 'grid_float_range_filter', 'width' => 100, ),
-																		),
-
-													),
-								),
+					'Grids'	=> Array (
+						'Default' => Array (
+							'Icons' => Array(
+								'default' => 'icon16_item.png',
+								0 => 'icon16_disabled.png',
+								1 => 'icon16_item.png',
+								2 => 'icon16_pending.png',
+								'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, ),
+							),
+						),
+					),
 	);
\ No newline at end of file
Index: branches/5.1.x/admin_templates/payment_type/payment_type_list.tpl
===================================================================
diff -u -r13100 -r13938
--- branches/5.1.x/admin_templates/payment_type/payment_type_list.tpl	(.../payment_type_list.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/payment_type/payment_type_list.tpl	(.../payment_type_list.tpl)	(revision 13938)
@@ -81,7 +81,7 @@
 	</script>
 </inp2:m_DefineElement>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="pt" IdField="PaymentTypeId" grid="Default" menu_filters="yes"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="pt" IdField="PaymentTypeId" grid="Default"/>
 <script type="text/javascript">
 	Grids['pt'].SetDependantToolbarButtons( new Array('edit', 'delete', 'approve', 'decline', 'setprimary', 'move_up', 'move_down') );
 
Index: branches/5.1.x/units/orders/orders_config.php
===================================================================
diff -u -r13578 -r13938
--- branches/5.1.x/units/orders/orders_config.php	(.../orders_config.php)	(revision 13578)
+++ branches/5.1.x/units/orders/orders_config.php	(.../orders_config.php)	(revision 13938)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_config.php 13578 2010-05-19 07:25:51Z alex $
+* @version	$Id: orders_config.php 13938 2010-09-14 09:12:39Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -226,24 +226,8 @@
 																	),
 											),
 
-					'TableName'			=>	TABLE_PREFIX.'Orders',
+					'TableName' => TABLE_PREFIX . 'Orders',					
 
-					'FilterMenu'		=>	Array (
-						'Groups' => Array (
-							Array ('mode' => 'AND', 'filters' => Array (0,1,2,3,4,5,6), 'type' => WHERE_FILTER),
-						),
-
-						'Filters' => Array (
-							0	=>	Array ('label' => 'la_Incomplete', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ),
-							1	=>	Array ('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1'  ),
-							2	=>	Array ('label' => 'la_BackOrders', 'on_sql' => '', 'off_sql' => '%1$s.Status != 2'  ),
-							3	=>	Array ('label' => 'la_ToShip', 'on_sql' => '', 'off_sql' => '%1$s.Status != 3' ),
-							4	=>	Array ('label' => 'la_Processed', 'on_sql' => '', 'off_sql' => '%1$s.Status != 4'  ),
-							5	=>	Array ('label' => 'la_Denied', 'on_sql' => '', 'off_sql' => '%1$s.Status != 5'  ),
-							6	=>	Array ('label' => 'la_Archived', 'on_sql' => '', 'off_sql' => '%1$s.Status != 6'  ),
-						)
-					),
-
 					'CalculatedFields' => Array (
 						'' => Array (
 							'CustomerName'			=>	'IF( ISNULL(u.Login), IF (%1$s.PortalUserId = ' . USER_ROOT . ', \'root\', IF (%1$s.PortalUserId = ' . USER_GUEST . ', \'Guest\', \'n/a\')), CONCAT(u.FirstName,\' \',u.LastName) )',
Index: branches/5.1.x/units/payment_type/payment_type_config.php
===================================================================
diff -u -r13549 -r13938
--- branches/5.1.x/units/payment_type/payment_type_config.php	(.../payment_type_config.php)	(revision 13549)
+++ branches/5.1.x/units/payment_type/payment_type_config.php	(.../payment_type_config.php)	(revision 13938)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: payment_type_config.php 13549 2010-05-11 21:03:39Z alex $
+* @version	$Id: payment_type_config.php 13938 2010-09-14 09:12:39Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -79,21 +79,11 @@
 					'TitleField'		=>	'Name',		// field, used in bluebar when editing existing item
 					'SubItems' => Array ('gwfv', 'ptc'),
 
-					'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'  ),
-												)
-											),
-
 					'CalculatedFields'	=>	Array (
-												''	=> Array (
-															'Gateway'		=>	TABLE_PREFIX.'Gateways.Name',
-														),
-											),
+						''	=> Array (
+							'Gateway' => TABLE_PREFIX . 'Gateways.Name',
+						),
+					),
 
 					'ListSQLs'			=>	Array (	'' => '	SELECT %1$s.* %2$s
 															FROM %1$s
@@ -102,11 +92,12 @@
 					'ItemSQLs'			=>	Array (	'' => 'SELECT * FROM %s',
 																		),
 					'ListSortings'	=> 	Array (
-																'' => Array (
-																	'ForcedSorting' => Array ('Priority' => 'desc'),
-																	'Sorting' => Array ('Name' => 'asc'),
-																)
-															),
+						'' => Array (
+							'ForcedSorting' => Array ('Priority' => 'desc'),
+							'Sorting' => Array ('Name' => 'asc'),
+						)
+					),
+					
 					'Fields'			=>	Array (
 					    'PaymentTypeId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,),
 					    'Name' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'required' =>true, 'max_len' => 100),
Index: branches/5.1.x/units/reports/reports_config.php
===================================================================
diff -u -r13549 -r13938
--- branches/5.1.x/units/reports/reports_config.php	(.../reports_config.php)	(revision 13549)
+++ branches/5.1.x/units/reports/reports_config.php	(.../reports_config.php)	(revision 13938)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: reports_config.php 13549 2010-05-11 21:03:39Z alex $
+* @version	$Id: reports_config.php 13938 2010-09-14 09:12:39Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -69,33 +69,16 @@
 						),
 					),
 
-					'FilterMenu'		=>	Array(
-												'Groups' => Array(
-													Array('mode' => 'AND', 'filters' => Array(0,1,2), 'type' => WHERE_FILTER),
-													Array('mode' => 'AND', 'filters' => Array(4,5,6), 'type' => WHERE_FILTER),
-												),
-												'Filters' => Array(
-													0	=>	Array('label' =>'la_Active', 'on_sql' => '', 'off_sql' => 'Status != 1' ),
-													1	=>	Array('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => 'Status != 2'  ),
-													2	=>	Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => 'Status != 0'  ),
-													3	=>	Array(),
-													4	=>	Array('label' => 'la_Flat', 'on_sql' => '', 'off_sql' => 'Type != 1'  ),
-													5	=>	Array('label' => 'la_Percent', 'on_sql' => '', 'off_sql' => 'Type != 2'  ),
-													6	=>	Array('label' => 'la_FreeShipping', 'on_sql' => '', 'off_sql' => 'Type != 3'  ),
-												)
-											),
-
 					'ListSQLs'			=>	Array(	'' => 'SELECT %1$s.* %2$s FROM %1$s',
 																		), // key - special, value - list select sql
 					'ItemSQLs'			=>	Array(	'' => 'SELECT * FROM %1$s',
 																		),
+					'ListSortings'	=> 	Array (
+						'' => Array (							
+							'Sorting' => Array ('Name' => 'asc'),
+						)
+					),
 
-					'ListSortings'	=> 	Array(
-																'' => Array(
-																	'Sorting' => Array('Name' => 'asc'),
-																)
-															),
-
 					'CalculatedFields' => Array (
 						'' => Array (
 							'CategoryId' => '0',
Index: branches/5.1.x/units/shipping/shipping_config.php
===================================================================
diff -u -r13914 -r13938
--- branches/5.1.x/units/shipping/shipping_config.php	(.../shipping_config.php)	(revision 13914)
+++ branches/5.1.x/units/shipping/shipping_config.php	(.../shipping_config.php)	(revision 13938)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: shipping_config.php 13914 2010-08-29 12:23:14Z alex $
+* @version	$Id: shipping_config.php 13938 2010-09-14 09:12:39Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -118,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')),
Index: branches/5.1.x/units/products/products_config.php
===================================================================
diff -u -r13809 -r13938
--- branches/5.1.x/units/products/products_config.php	(.../products_config.php)	(revision 13809)
+++ branches/5.1.x/units/products/products_config.php	(.../products_config.php)	(revision 13938)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: products_config.php 13809 2010-07-07 09:37:47Z alex $
+* @version	$Id: products_config.php 13938 2010-09-14 09:12:39Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -345,33 +345,22 @@
 					),
 
 					'FilterMenu'		=>	Array (
-												'Groups' => Array (
-													Array ('mode' => 'AND', 'filters' => Array ('show_active', 'show_pending', 'show_disabled'), 'type' => WHERE_FILTER),
-													Array ('mode' => 'AND', 'filters' => Array ('show_tang', 'show_sub', 'show_serv', 'show_download', 'show_package'), 'type' => WHERE_FILTER),
-													Array ('mode' => 'AND', 'filters' => Array ('show_new'), 'type' => HAVING_FILTER),
-													Array ('mode' => 'AND', 'filters' => Array ('show_hot'), 'type' => HAVING_FILTER),
-													Array ('mode' => 'AND', 'filters' => Array ('show_pop'), 'type' => HAVING_FILTER),
-													Array ('mode' => 'AND', 'filters' => Array ('show_pick'), 'type' => WHERE_FILTER),
-												),
-												'Filters' => Array (
-													'show_active'	=>	Array ('label' => 'la_Active', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ),
-													'show_pending'	=>	Array ('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => '%1$s.Status != 2'  ),
-													'show_disabled'	=>	Array ('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0'  ),
-													's1'	=>	Array (),
-													'show_tang'	=>		Array ('label' => 'la_product_tangible', 'on_sql' => '', 'off_sql' => '%1$s.Type != 1'  ),
-													'show_sub'	=>		Array ('label' => 'la_product_subscription', 'on_sql' => '', 'off_sql' => '%1$s.Type != 2'  ),
-													'show_serv'	=>		Array ('label' => 'la_product_service', 'on_sql' => '', 'off_sql' => '%1$s.Type != 3'  ),
-													'show_download'	=>	Array ('label' => 'la_product_downloadable', 'on_sql' => '', 'off_sql' => '%1$s.Type != 4'  ),
-													'show_package'	=>	Array ('label' => 'la_product_package', 'on_sql' => '', 'off_sql' => '%1$s.Type != 5'  ),
-													's2'	=>	Array (),
-													'show_new'	=>	Array ('label' => 'la_Text_New', 'on_sql' => '', 'off_sql' => '`IsNew` != 1'  ),
-													'show_hot'	=>	Array ('label' => 'la_Text_TopSellers', 'on_sql' => '', 'off_sql' => '`IsHot` != 1'  ),
-													'show_pop'	=>	Array ('label' => 'la_Text_Pop', 'on_sql' => '', 'off_sql' => '`IsPop` != 1'  ),
-													'show_pick'	=>	Array ('label' => 'la_prompt_EditorsPick', 'on_sql' => '', 'off_sql' => '%1$s.`EditorsPick` != 1'  ),
-												)
-											),
+						'Groups' => Array (
+							Array ('mode' => 'AND', 'filters' => Array ('show_new'), 'type' => HAVING_FILTER),
+							Array ('mode' => 'AND', 'filters' => Array ('show_hot'), 'type' => HAVING_FILTER),
+							Array ('mode' => 'AND', 'filters' => Array ('show_pop'), 'type' => HAVING_FILTER),
+							Array ('mode' => 'AND', 'filters' => Array ('show_pick'), 'type' => WHERE_FILTER),
+						),
+						'Filters' => Array (
+							'show_new'	=>	Array ('label' => 'la_Text_New', 'on_sql' => '', 'off_sql' => '`IsNew` != 1'  ),
+							'show_hot'	=>	Array ('label' => 'la_Text_TopSellers', 'on_sql' => '', 'off_sql' => '`IsHot` != 1'  ),
+							'show_pop'	=>	Array ('label' => 'la_Text_Pop', 'on_sql' => '', 'off_sql' => '`IsPop` != 1'  ),
+							'show_pick'	=>	Array ('label' => 'la_prompt_EditorsPick', 'on_sql' => '', 'off_sql' => '%1$s.`EditorsPick` != 1'  ),
+						)
+					),
 
-					'TableName'			=>	TABLE_PREFIX.'Products',
+					'TableName' => TABLE_PREFIX . 'Products',
+					
 					'CalculatedFields' => Array (
 						''	=>	Array (
 							'AltName'		=>	'img.AltName',
Index: branches/5.1.x/units/shipping_quote_engines/shipping_quote_engines_config.php
===================================================================
diff -u -r13813 -r13938
--- branches/5.1.x/units/shipping_quote_engines/shipping_quote_engines_config.php	(.../shipping_quote_engines_config.php)	(revision 13813)
+++ branches/5.1.x/units/shipping_quote_engines/shipping_quote_engines_config.php	(.../shipping_quote_engines_config.php)	(revision 13938)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: shipping_quote_engines_config.php 13813 2010-07-07 09:44:57Z alex $
+* @version	$Id: shipping_quote_engines_config.php 13938 2010-09-14 09:12:39Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -67,25 +67,16 @@
 
 					'TableName'			=>	TABLE_PREFIX.'ShippingQuoteEngines',
 
-					'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 (
 			            'EngineId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 			            'Name' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
Index: branches/5.1.x/units/coupons/coupons_config.php
===================================================================
diff -u -r13578 -r13938
--- branches/5.1.x/units/coupons/coupons_config.php	(.../coupons_config.php)	(revision 13578)
+++ branches/5.1.x/units/coupons/coupons_config.php	(.../coupons_config.php)	(revision 13938)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: coupons_config.php 13578 2010-05-19 07:25:51Z alex $
+* @version	$Id: coupons_config.php 13938 2010-09-14 09:12:39Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -91,32 +91,17 @@
 																				),
 											),
 
-					'FilterMenu'		=>	Array(
-												'Groups' => Array(
-													Array('mode' => 'AND', 'filters' => Array(0,1,2), 'type' => WHERE_FILTER),
-													Array('mode' => 'AND', 'filters' => Array(4,5/*,6*/), 'type' => WHERE_FILTER),
-												),
-												'Filters' => Array(
-													0	=>	Array('label' =>'la_Enabled', 'on_sql' => '', 'off_sql' => 'Status != 1' ),
-													1	=>	Array('label' => 'la_Used', 'on_sql' => '', 'off_sql' => 'Status != 2'  ),
-													2	=>	Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => 'Status != 0'  ),
-													3	=>	Array(),
-													4	=>	Array('label' => 'la_Flat', 'on_sql' => '', 'off_sql' => 'Type != 1'  ),
-													5	=>	Array('label' => 'la_Percent', 'on_sql' => '', 'off_sql' => 'Type != 2'  ),
-												//	6	=>	Array('label' => 'la_FreeShipping', 'on_sql' => '', 'off_sql' => 'Type != 3'  ),
-												)
-											),
-
 					'ListSQLs'			=>	Array(	''=>'SELECT %1$s.* %2$s FROM %1$s',
 																		), // key - special, value - list select sql
 					'ItemSQLs'			=>	Array(	''=>'SELECT * FROM %1$s',
 																		),
 
-					'ListSortings'	=> 	Array(
-																'' => Array(
-																	'Sorting' => Array('Name' => 'asc'),
-																)
-															),
+					'ListSortings' => Array (
+						'' => Array(
+							'Sorting' => Array('Name' => 'asc'),
+						)
+					),
+
 					'Fields'			=>	Array(
 											    'CouponId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 											    'Status' => Array (
@@ -164,6 +149,7 @@
 																		'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, ),
@@ -184,6 +170,7 @@
 																		'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, ),
Index: branches/5.1.x/admin_templates/discounts/gift_certificate_list.tpl
===================================================================
diff -u -r13100 -r13938
--- branches/5.1.x/admin_templates/discounts/gift_certificate_list.tpl	(.../gift_certificate_list.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/discounts/gift_certificate_list.tpl	(.../gift_certificate_list.tpl)	(revision 13938)
@@ -46,7 +46,7 @@
 </tbody>
 </table>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="gc" IdField="GiftCertificateId" grid="Default" menu_filters="yes"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="gc" IdField="GiftCertificateId" grid="Default"/>
 <script type="text/javascript">
 	Grids['gc'].SetDependantToolbarButtons( new Array('edit','delete','e-mail') );
 
Index: branches/5.1.x/units/gift_certificates/gift_certificates_config.php
===================================================================
diff -u -r13465 -r13938
--- branches/5.1.x/units/gift_certificates/gift_certificates_config.php	(.../gift_certificates_config.php)	(revision 13465)
+++ branches/5.1.x/units/gift_certificates/gift_certificates_config.php	(.../gift_certificates_config.php)	(revision 13938)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: gift_certificates_config.php 13465 2010-04-28 15:08:00Z alex $
+* @version	$Id: gift_certificates_config.php 13938 2010-09-14 09:12:39Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -70,20 +70,8 @@
 				'priority'		=>	3.3, // <parent_priority>.<own_priority>, because this section replaces parent in tree
 				'type'			=>	stTAB,
 			),
-		),
+		),		
 
-		'FilterMenu' => Array (
-			'Groups' => Array(
-				Array ('mode' => 'AND', 'filters' => Array(0,1,2), 'type' => WHERE_FILTER),
-			),
-
-			'Filters' => Array(
-				0	=>	Array('label' =>'la_Enabled', 'on_sql' => '', 'off_sql' => 'Status != 1' ),
-				1	=>	Array('label' => 'la_Used', 'on_sql' => '', 'off_sql' => 'Status != 2'  ),
-				2	=>	Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => 'Status != 0'  ),
-			)
-		),
-
 		'ListSQLs' => Array ('' => 'SELECT %1$s.* %2$s FROM %1$s',),
 		'ItemSQLs' => Array ('' => 'SELECT * FROM %1$s',),
 
Index: branches/5.1.x/admin_templates/discounts/coupon_selector.tpl
===================================================================
diff -u -r13100 -r13938
--- branches/5.1.x/admin_templates/discounts/coupon_selector.tpl	(.../coupon_selector.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/discounts/coupon_selector.tpl	(.../coupon_selector.tpl)	(revision 13938)
@@ -42,6 +42,6 @@
 </tbody>
 </table>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="coup" IdField="CouponId" grid="Radio" menu_filters="yes"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="coup" IdField="CouponId" grid="Radio"/>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/5.1.x/admin_templates/shipping/shipping_custom_list.tpl
===================================================================
diff -u -r13100 -r13938
--- branches/5.1.x/admin_templates/shipping/shipping_custom_list.tpl	(.../shipping_custom_list.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/shipping/shipping_custom_list.tpl	(.../shipping_custom_list.tpl)	(revision 13938)
@@ -61,7 +61,7 @@
 </tbody>
 </table>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="s" IdField="ShippingID" grid="Default" menu_filters="yes"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="s" IdField="ShippingID" grid="Default"/>
 <script type="text/javascript">
 	Grids['s'].SetDependantToolbarButtons( new Array('edit','delete','clone','approve','decline') );
 </script>