Index: branches/5.2.x/units/pricing/pricing_config.php =================================================================== diff -u -N -r14569 -r14582 --- branches/5.2.x/units/pricing/pricing_config.php (.../pricing_config.php) (revision 14569) +++ branches/5.2.x/units/pricing/pricing_config.php (.../pricing_config.php) (revision 14582) @@ -1,6 +1,6 @@ 1, 'default' => 0, ), 'GroupId' => Array ('type' => 'int', 'default' => 0, 'not_null' => 1), - + /* TODO implement these fields in business logic 'AccessRebillDate' => Array ( 'type'=> 'int', 'min_value' => 0, 'max_value' => 31, 'not_null'=> '1', 'default' => 0, @@ -123,30 +123,13 @@ ), 'Grids' => Array ( - /* - 'Default' => Array ( - 'Icons' => Array ( - 'default' => 'icon16_item.png', - 'module' => 'core', - ), - 'Fields' => Array ( - 'MinQty' => Array ( 'title'=> 'la_col_MinQty', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), - 'MaxQty' => Array ( 'title'=> 'la_col_MaxQty', 'filter_block' => 'grid_range_filter'), - 'Price' => Array ( 'title'=> 'la_col_Price', 'filter_block' => 'grid_range_filter'), - 'Points' => Array ( 'title'=> 'la_col_Points', 'filter_block' => 'grid_range_filter'), - 'Cost' => Array ( 'title'=> 'la_col_Cost', 'filter_block' => 'grid_range_filter'), - 'Negotiated' => Array ( 'title'=> 'la_col_Negotiated', 'data_block' => 'negotiated_td', 'filter_block' => 'grid_options_filter'), - ), - - ), - */ 'Access' => Array ( 'Icons' => Array ('default'=> 'icon16_pricing.gif', '0'=> 'icon16_pricing.gif', '1'=> 'icon16_pricing_primary.gif'), 'Fields' => Array ( - 'AccessDuration' => Array ( 'title'=> 'la_col_AccessDuration', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), - 'AccessUnit' => Array ( 'title'=> 'la_col_AccessDurationUnit', 'filter_block' => 'grid_options_filter'), - 'Description' => Array ( 'title'=> 'la_col_Description', 'filter_block' => 'grid_like_filter'), - 'Price' => Array ( 'title'=> 'la_col_Price', 'filter_block' => 'grid_float_range_filter'), + 'AccessDuration' => Array ('data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), + 'AccessUnit' => Array ( 'title'=> 'column:la_fld_AccessDurationUnit', 'filter_block' => 'grid_options_filter'), + 'Description' => Array ('filter_block' => 'grid_like_filter'), + 'Price' => Array ( 'filter_block' => 'grid_float_range_filter'), ), ),