Index: branches/5.1.x/units/orders/orders_config.php
===================================================================
diff -u -N -r13938 -r13959
--- branches/5.1.x/units/orders/orders_config.php	(.../orders_config.php)	(revision 13938)
+++ branches/5.1.x/units/orders/orders_config.php	(.../orders_config.php)	(revision 13959)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_config.php 13938 2010-09-14 09:12:39Z alex $
+* @version	$Id: orders_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
@@ -226,7 +226,7 @@
 																	),
 											),
 
-					'TableName' => TABLE_PREFIX . 'Orders',					
+					'TableName' => TABLE_PREFIX . 'Orders',
 
 					'CalculatedFields' => Array (
 						'' => Array (
@@ -399,7 +399,7 @@
 			            'ReturnTotal' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'),
 			            'CostTotal' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'),
 			            'OriginalAmount'	=>	Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'),
-			            'ShippingOption' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array (0 => 'la_ship_all_together', 1 => 'la_ship_backorder_separately', 2 => 'la_ship_backorders_upon_avail'), 'default' =>0),
+			            'ShippingOption' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array (0 => 'la_ship_all_together', 1 => 'la_ship_backorder_separately', 2 => 'la_ship_backorders_upon_avail'), 'not_null' => 1, 'default' =>0),
 			            'ShippingGroupOption' => Array ('type' => 'int', 'not_null' => 1, 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array (0 => 'la_auto_group_shipments', 1 => 'la_manual_group_shipments'), 'default' =>0),
 			            'GiftCertificateId' => Array ('type' => 'int', 'default' => null),
 			            'GiftCertificateDiscount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00',),
@@ -436,11 +436,15 @@
 
 					'VirtualFields'	=> 	Array (
 						'CustomerName'			=>	Array ('type' => 'string', 'default' => '', 'filter_type' => 'like'),
-						'TotalAmount'			=>	Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'),
-						'AmountWithoutVAT'		=>	Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'),
-						'SubtotalWithDiscount'	=>	Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'),
-						'SubtotalWithoutDiscount'	=>	Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'),
+						'TotalAmount'			=>	Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'default' => '0.00'),
+						'AmountWithoutVAT'		=>	Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'default' => '0.00'),
+						'SubtotalWithDiscount'	=>	Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'default' => '0.00'),
+						'SubtotalWithoutDiscount'	=>	Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'default' => '0.00'),
 						'OrderNumber'			=>	Array ('type' => 'string', 'default' => '', 'filter_type' => 'like'),
+						'CouponCode'			=>	Array ('type' => 'string', 'default' => ''),
+						'CouponName'			=>	Array ('type' => 'string', 'default' => ''),
+						'GiftCertificateCode'	=>	Array ('type' => 'string', 'default' => ''),
+						'GiftCertificateRecipient'	=>	Array ('type' => 'string', 'default' => ''),
 
 						// for ResetToUser
 						'UserTo'		=>	Array ('type' => 'string', 'default' => ''),
@@ -456,16 +460,11 @@
 						'UserCountry'	=>	Array ('type' => 'string', 'default' => ''),
 
 						// for Search
-						'Username'		=>	Array ('type' => 'string', 'filter_type' => 'like'),
-						'OrderSearchId' =>	Array ('type' => 'int', 'filter_type' => 'equals', 'filter_field' => 'OrderId'),
-						'FromDateTime'	=>	Array ('formatter' => 'kDateFormatter', 'default' => '', 'filter_type' => 'range_from', 'filter_field' => 'OrderDate' ),
-						'ToDateTime'	=>	Array ('formatter' => 'kDateFormatter', 'default' => '', 'filter_type' => 'range_to', 'filter_field' => 'OrderDate', 'empty_time' => adodb_mktime(23,59,59) ),
-						'FromAmount'	=>	Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'filter_type' => 'range_from', 'filter_field' => 'TotalAmount'),
-						'ToAmount'	=>	Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'filter_type' => 'range_to', 'filter_field' => 'TotalAmount'),
-						'HasBackOrders' => Array ('default' =>false),
-						'PaymentCVV2'	=>	Array ('type' => 'string', 'default' =>false),
-						'AffiliateUser' =>	Array ('type' => 'string', 'filter_type' => 'like'),
-						'AffiliatePortalUserId' => Array ('type' => 'int'),
+						'Username'		=>	Array ('type' => 'string', 'filter_type' => 'like', 'default' => ''),
+						'HasBackOrders' => Array ('type' => 'int', 'default' => 0),
+						'PaymentCVV2'	=>	Array ('type' => 'string', 'default' => ''),
+						'AffiliateUser' =>	Array ('type' => 'string', 'filter_type' => 'like', 'default' => ''),
+						'AffiliatePortalUserId' => Array ('type' => 'int', 'default' => 0),
 
 						// export related fields: begin
 						'ExportFormat'			=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'CSV', /*2 => 'XML'*/), 'default' => 1),
@@ -478,18 +477,18 @@
 					    	'type' => 'int',
 					    	'formatter' => 'kOptionsFormatter',
 					    	'options' => Array (0 => 'la_No', 1 => 'la_Yes'),
-					    	'use_phrases' => 1, 'not_null' => 1, 'default' => 1,
+					    	'use_phrases' => 1, 'default' => 1,
 						),
-						'ExportColumns'			=>	Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array ()),
-						'AvailableColumns'		=>	Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array ()),
-						'ExportPresets' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array ()),
+						'ExportColumns'			=>	Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => ''),
+						'AvailableColumns'		=>	Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => ''),
+						'ExportPresets' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => ''),
 						'ExportSavePreset' => Array (
 					    	'type' => 'int',
 					    	'formatter' => 'kOptionsFormatter',
 					    	'options' => Array (0 => 'la_No', 1 => 'la_Yes'),
-					    	'use_phrases' => 1, 'not_null' => 1, 'default' => 0,
+					    	'use_phrases' => 1, 'default' => 0,
 						),
-						'ExportPresetName' =>	Array ('type' => 'string'),
+						'ExportPresetName' =>	Array ('type' => 'string', 'default' => ''),
 						// export related fields: end
 					),
 					'Grids'	=> Array (