Index: branches/5.1.x/units/discounts/discounts_config.php
===================================================================
diff -u -N -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