Index: branches/5.3.x/units/orders/orders_config.php
===================================================================
diff -u -N -r15656 -r15671
--- branches/5.3.x/units/orders/orders_config.php	(.../orders_config.php)	(revision 15656)
+++ branches/5.3.x/units/orders/orders_config.php	(.../orders_config.php)	(revision 15671)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_config.php 15656 2013-01-02 17:24:49Z alex $
+* @version	$Id: orders_config.php 15671 2013-01-17 11:39:41Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -252,16 +252,16 @@
 
 	'CalculatedFields' => Array (
 		'' => Array (
-			'CustomerName' => 'IF( ISNULL(u.Username), IF (%1$s.PortalUserId = ' . USER_ROOT . ', \'root\', IF (%1$s.PortalUserId = ' . USER_GUEST . ', \'Guest\', \'n/a\')), CONCAT(u.FirstName,\' \',u.LastName) )',
-			'Username' => 'IF( ISNULL(u.Username),\'root\',u.Username)',
+			'CustomerName' => 'IF( ISNULL(u.Username), IF (%1$s.PortalUserId = ' . USER_ROOT . ', "root", IF (%1$s.PortalUserId = ' . USER_GUEST . ', "Guest", "n/a")), CONCAT(u.FirstName," ",u.LastName) )',
+			'Username' => 'IF( ISNULL(u.Username),"root",IF(u.Username = "", u.Email, u.Username))',
 			'OrderNumber' => 'CONCAT(LPAD(Number,6,"0"),\'-\',LPAD(SubNumber,3,"0") )',
 			'SubtotalWithoutDiscount' => '(SubTotal + DiscountTotal)',
 			'SubtotalWithDiscount' => '(SubTotal)',
 			'AmountWithoutVAT' => '(SubTotal+IF(ShippingTaxable=1, ShippingCost, 0)+IF(ProcessingTaxable=1, ProcessingFee, 0)-IF(VATIncluded=1,VAT,0))',
 			'TotalAmount' => 'SubTotal+ShippingCost+IF(VATIncluded=1,0,VAT)+ProcessingFee+InsuranceFee-GiftCertificateDiscount',
 			'CouponCode' => 'pc.Code',
 			'CouponName' => 'pc.Name',
-			'AffiliateUser' => 'IF( LENGTH(au.Username),au.Username,\'!la_None!\')',
+			'AffiliateUser' => 'IF(au.PortalUserId IS NULL, "!la_None!", IF(au.Username = "", au.Email, au.Username))',
 			'AffiliatePortalUserId' => 'af.PortalUserId',
 			'GiftCertificateCode' => 'gc.Code',
 			'GiftCertificateRecipient' => 'gc.Recipient',
@@ -315,7 +315,7 @@
 			'not_null' => 1, 'default' => 0,
 		),
 		'OrderDate' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#'),
-		'PortalUserId' =>Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' =>Array (USER_ROOT => 'root', USER_GUEST => 'Guest'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Users WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Username', 'required' =>1, 'not_null' =>1, 'default' =>-1),
+		'PortalUserId' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'), 'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Users WHERE %s', 'left_key_field' => 'PortalUserId', 'left_title_field' => USER_TITLE_FIELD, 'required' => 1, 'not_null' => 1, 'default' => -1),
 		'OrderIP' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'filter_type' => 'like'),
 		'UserComment' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL),
 		'AdminComment' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL),