Index: branches/5.1.x/units/shipping_quote_engines/shipping_quote_engines_config.php
===================================================================
diff -u -N -r13938 -r13959
--- branches/5.1.x/units/shipping_quote_engines/shipping_quote_engines_config.php	(.../shipping_quote_engines_config.php)	(revision 13938)
+++ branches/5.1.x/units/shipping_quote_engines/shipping_quote_engines_config.php	(.../shipping_quote_engines_config.php)	(revision 13959)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: shipping_quote_engines_config.php 13938 2010-09-14 09:12:39Z alex $
+* @version	$Id: shipping_quote_engines_config.php 13959 2010-09-25 18:36:10Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -76,7 +76,7 @@
 							'Sorting' => Array ('Name' => 'asc'),
 						)
 					),
-					
+
 					'Fields' => Array (
 			            'EngineId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 			            'Name' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
@@ -97,82 +97,96 @@
 			        ),
 
 					'VirtualFields' => Array (
-						'AccountLogin'		=>	Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
-						'AccountPassword'	=>	Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+						'AccountLogin'		=>	Array ('type' => 'string', 'default' => ''),
+						'AccountPassword'	=>	Array ('type' => 'string', 'default' => ''),
 						'UPSEnabled'		=>	Array (
 							'type' => 'int',
 							'formatter' => 'kOptionsFormatter',
 							'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+							'default' => 0
 			        	),
-						'UPSAccount'		=>	Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+						'UPSAccount'		=>	Array ('type' => 'string', 'default' => ''),
 						'UPSInvoiced'		=>	Array (
 							'type' => 'int',
 							'formatter' => 'kOptionsFormatter',
 							'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced'),
+							'default' => 0
 			        	),
 						'FDXEnabled'		=>	Array (
 							'type' => 'int',
 							'formatter' => 'kOptionsFormatter',
 							'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+							'default' => 0
 			        	),
-						'FDXAccount'		=>	Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+						'FDXAccount'		=>	Array ('type' => 'string', 'default' => ''),
 						'FDXInvoiced'		=>	Array (
 							'type' => 'int',
 							'formatter' => 'kOptionsFormatter',
 							'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced'),
+							'default' => 0
 			        	),
 						'DHLEnabled'		=>	Array (
 							'type' => 'int',
 							'formatter' => 'kOptionsFormatter',
 							'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+							'default' => 0
 			        	),
-						'DHLAccount'		=>	Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+						'DHLAccount'		=>	Array ('type' => 'string', 'default' => ''),
 						'DHLInvoiced'		=>	Array (
 							'type' => 'int',
 							'formatter' => 'kOptionsFormatter',
 							'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced'),
+							'default' => 0
 			        	),
 						'USPEnabled'		=>	Array (
 							'type' => 'int',
 							'formatter' => 'kOptionsFormatter',
 							'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+							'default' => 0
 			        	),
-						'USPAccount'		=>	Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+						'USPAccount'		=>	Array ('type' => 'string', 'default' => ''),
 						'USPInvoiced'		=>	Array (
 							'type' => 'int',
 							'formatter' => 'kOptionsFormatter',
 							'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced'),
+							'default' => 0
 			        	),
 						'ARBEnabled'		=>	Array (
 							'type' => 'int',
 							'formatter' => 'kOptionsFormatter',
 							'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+							'default' => 0
 			        	),
-						'ARBAccount'		=>	Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
+						'ARBAccount'		=>	Array ('type' => 'string', 'default' => ''),
 						'ARBInvoiced'		=>	Array (
 							'type' => 'int',
 							'formatter' => 'kOptionsFormatter',
 							'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced'),
+							'default' => 0
 			        	),
 						'1DYEnabled'		=>	Array (
 							'type' => 'int',
 							'formatter' => 'kOptionsFormatter',
 							'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+							'default' => 0
 			        	),
 						'2DYEnabled'		=>	Array (
 							'type' => 'int',
 							'formatter' => 'kOptionsFormatter',
 							'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+							'default' => 0
 			        	),
 						'3DYEnabled'		=>	Array (
 							'type' => 'int',
 							'formatter' => 'kOptionsFormatter',
 							'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+							'default' => 0
 			        	),
 						'GNDEnabled'		=>	Array (
 							'type' => 'int',
 							'formatter' => 'kOptionsFormatter',
 							'options' => Array (1 => 'Enabled', 0 => 'Disabled'),
+							'default' => 0
 			        	),
 						'ShipMethod'		=>	Array (
 							'type' => 'string',
@@ -181,6 +195,7 @@
 								'DRP' => 'Drop-Off At Carrier Location',
 								'PCK' => 'Schedule A Special Pickup',
 								'SCD' => 'Regularly Scheduled Pickup'),
+							'default' => null
 			        	),
 					),
 					'Grids'	=> Array (