Index: branches/5.0.x/units/shipping_quote_engines/shipping_quote_engines_config.php
===================================================================
diff -u -r12924 -r13267
--- branches/5.0.x/units/shipping_quote_engines/shipping_quote_engines_config.php	(.../shipping_quote_engines_config.php)	(revision 12924)
+++ branches/5.0.x/units/shipping_quote_engines/shipping_quote_engines_config.php	(.../shipping_quote_engines_config.php)	(revision 13267)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: shipping_quote_engines_config.php 12739 2009-10-20 19:38:22Z alex $
+* @version	$Id: shipping_quote_engines_config.php 13267 2010-03-19 13:13:03Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -42,10 +42,10 @@
 					'TitlePresets'		=>	Array (
 												'default'	=>	Array (	'edit_status_labels'	=> Array ('sqe' => '!la_title_EditingShippingQuoteEngine!'),
 																),
-												'engine_list'=>Array (		'prefixes'				=> Array ('sqe_List'),
+												'engine_list' =>Array (		'prefixes'				=> Array ('sqe_List'),
 																			'format'				=>	"!la_title_ShippingQuoteEngines!",
 																),
-												'engine_edit'=>Array (		'prefixes'				=> Array ('sqe'),
+												'engine_edit' =>Array (		'prefixes'				=> Array ('sqe'),
 																			'format'				=> "#sqe_status# '#sqe_titlefield#' - !la_title_General!",
 																),
 											),
@@ -71,54 +71,122 @@
 													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_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'),
+					'ListSQLs'			=>	Array (	'' =>	'SELECT * FROM %s'),
 																		 // key - special, value - list select sql
-					'ItemSQLs'			=>	Array (	''=>	'SELECT * FROM %s'),
+					'ItemSQLs'			=>	Array (	'' =>	'SELECT * FROM %s'),
 
 					'ListSortings'	=> 	Array (
 																'' => Array (
 																	'Sorting' => Array ('Name' => 'asc'),
 																)
 															),
 					'Fields' => Array (
-							            'EngineId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
-							            'Name' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''),
-							            'FlatSurcharge' => Array ('type' => 'double', 'not_null' => '1', 'default' => '0'),
-							            'PercentSurcharge' => Array ('type' => 'double', 'not_null' => '1', 'default' => '0'),
-							            'Status' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array ( 1 => 'la_Enabled', 0 => 'la_Disabled' ), 'default' => 0, 'not_null' => 1),
-							            'Properties' => Array ('type' => 'string', 'default' => NULL),
-							            'ClassName' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''),
-							        ),
+			            'EngineId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
+			            'Name' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+			            'FlatSurcharge' => Array ('type' => 'double', 'not_null' => 1, 'default' => '0'),
+			            'PercentSurcharge' => Array ('type' => 'double', 'not_null' => 1, 'default' => '0'),
+			            'Status' => Array (
+			            	'type' => 'int',
+			            	'formatter' => 'kOptionsFormatter', 
+			            	'options' => Array ( 1 => 'la_Enabled', 0 => 'la_Disabled' ), 'use_phrases' => 1,
+			            	'default' => 0, 'not_null' => 1,
+						),
+			            'Properties' => Array ('type' => 'string', 'default' => NULL),
+			            'ClassName' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+			        ),
 
 					'VirtualFields' => Array (
-											'AccountLogin'		=>	Array ('type' => 'string', 'not_null' => '1', 'default' => ''),
-											'AccountPassword'	=>	Array ('type' => 'string', 'not_null' => '1', 'default' => ''),
-											'UPSEnabled'		=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Enabled', 0 => 'Disabled')),
-											'UPSAccount'		=>	Array ('type' => 'string', 'not_null' => '1', 'default' => ''),
-											'UPSInvoiced'		=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced')),
-											'FDXEnabled'		=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Enabled', 0 => 'Disabled')),
-											'FDXAccount'		=>	Array ('type' => 'string', 'not_null' => '1', 'default' => ''),
-											'FDXInvoiced'		=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced')),
-											'DHLEnabled'		=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Enabled', 0 => 'Disabled')),
-											'DHLAccount'		=>	Array ('type' => 'string', 'not_null' => '1', 'default' => ''),
-											'DHLInvoiced'		=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced')),
-											'USPEnabled'		=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Enabled', 0 => 'Disabled')),
-											'USPAccount'		=>	Array ('type' => 'string', 'not_null' => '1', 'default' => ''),
-											'USPInvoiced'		=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced')),
-											'ARBEnabled'		=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Enabled', 0 => 'Disabled')),
-											'ARBAccount'		=>	Array ('type' => 'string', 'not_null' => '1', 'default' => ''),
-											'ARBInvoiced'		=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced')),
-											'1DYEnabled'		=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Enabled', 0 => 'Disabled')),
-											'2DYEnabled'		=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Enabled', 0 => 'Disabled')),
-											'3DYEnabled'		=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Enabled', 0 => 'Disabled')),
-											'GNDEnabled'		=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Enabled', 0 => 'Disabled')),
-											'ShipMethod'		=>	Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array ('DRP' => 'Drop-Off At Carrier Location', 'PCK' => 'Schedule A Special Pickup', 'SCD' => 'Regularly Scheduled Pickup')),
-										),
+						'AccountLogin'		=>	Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+						'AccountPassword'	=>	Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+						'UPSEnabled'		=>	Array (
+							'type' => 'int',
+							'formatter' => 'kOptionsFormatter',
+							'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+			        	),
+						'UPSAccount'		=>	Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+						'UPSInvoiced'		=>	Array (
+							'type' => 'int',
+							'formatter' => 'kOptionsFormatter',
+							'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced'),
+			        	),
+						'FDXEnabled'		=>	Array (
+							'type' => 'int',
+							'formatter' => 'kOptionsFormatter',
+							'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+			        	),
+						'FDXAccount'		=>	Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+						'FDXInvoiced'		=>	Array (
+							'type' => 'int',
+							'formatter' => 'kOptionsFormatter',
+							'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced'),
+			        	),
+						'DHLEnabled'		=>	Array (
+							'type' => 'int',
+							'formatter' => 'kOptionsFormatter',
+							'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+			        	),
+						'DHLAccount'		=>	Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+						'DHLInvoiced'		=>	Array (
+							'type' => 'int',
+							'formatter' => 'kOptionsFormatter',
+							'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced'),
+			        	),
+						'USPEnabled'		=>	Array (
+							'type' => 'int',
+							'formatter' => 'kOptionsFormatter',
+							'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+			        	),
+						'USPAccount'		=>	Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+						'USPInvoiced'		=>	Array (
+							'type' => 'int',
+							'formatter' => 'kOptionsFormatter',
+							'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced'),
+			        	),
+						'ARBEnabled'		=>	Array (
+							'type' => 'int',
+							'formatter' => 'kOptionsFormatter',
+							'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+			        	),
+						'ARBAccount'		=>	Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+						'ARBInvoiced'		=>	Array (
+							'type' => 'int',
+							'formatter' => 'kOptionsFormatter',
+							'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced'),
+			        	),
+						'1DYEnabled'		=>	Array (
+							'type' => 'int',
+							'formatter' => 'kOptionsFormatter',
+							'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+			        	),
+						'2DYEnabled'		=>	Array (
+							'type' => 'int',
+							'formatter' => 'kOptionsFormatter',
+							'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+			        	),
+						'3DYEnabled'		=>	Array (
+							'type' => 'int',
+							'formatter' => 'kOptionsFormatter',
+							'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+			        	),
+						'GNDEnabled'		=>	Array (
+							'type' => 'int',
+							'formatter' => 'kOptionsFormatter',
+							'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+			        	),
+						'ShipMethod'		=>	Array (
+							'type' => 'string',
+							'formatter' => 'kOptionsFormatter',
+							'options' => Array (
+								'DRP' => 'Drop-Off At Carrier Location',
+								'PCK' => 'Schedule A Special Pickup',
+								'SCD' => 'Regularly Scheduled Pickup'),
+			        	),
+					),
 					'Grids'	=> Array (
 						'Default' =>	Array (
 							'Icons' => Array (