Index: branches/5.2.x/units/orders/orders_config.php
===================================================================
diff -u -N -r14723 -r14807
--- branches/5.2.x/units/orders/orders_config.php	(.../orders_config.php)	(revision 14723)
+++ branches/5.2.x/units/orders/orders_config.php	(.../orders_config.php)	(revision 14807)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_config.php 14723 2011-11-03 08:41:26Z alex $
+* @version	$Id: orders_config.php 14807 2011-11-29 14:13:34Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -367,11 +367,10 @@
 			            'ShippingPhone' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
 			            'ShippingFax' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
 			            'ShippingEmail' => Array (
-			            	'type' => 'string', 'not_null' => 1, 'default' => '',
-			            	'formatter' => 'kOptionsFormatter',
-			            	'options' => Array (),
-							'option_key_field' => 'DestAbbr',
-							'option_title_field' => 'Translation',
+			            	'type' => 'string',
+			            	'formatter' => 'kFormatter',
+			            	'regexp' => '/^(' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . ')$/i',
+			            	'not_null' => 1, 'default' => '',
 						),
 			            'ShippingAddress1' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
 			            'ShippingAddress2' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),