Index: branches/5.2.x/units/affiliate_payments/affiliate_payments_config.php
===================================================================
diff -u -N -r15009 -r15560
--- branches/5.2.x/units/affiliate_payments/affiliate_payments_config.php	(.../affiliate_payments_config.php)	(revision 15009)
+++ branches/5.2.x/units/affiliate_payments/affiliate_payments_config.php	(.../affiliate_payments_config.php)	(revision 15560)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: affiliate_payments_config.php 15009 2012-01-06 20:37:54Z alex $
+* @version	$Id: affiliate_payments_config.php 15560 2012-10-09 16:04:33Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -87,7 +87,7 @@
 													'PortalUserId'	=>	'af.PortalUserId',
 												),
 												'log' 	=> Array(
-													'Username'		=>	'au.Username',
+													'Username'		=>	'IF(au.Username = "", au.Email, au.Username)',
 													'PortalUserId'	=>	'af.PortalUserId',
 												),
 											),
@@ -106,7 +106,7 @@
 
 					'Fields' => Array(
 										'AffiliatePaymentId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
-										'AffiliateId' => Array('type'=>'int','formatter'=>'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array(0 => 'lu_None'), 'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'Users pu ON pu.PortalUserId = af.PortalUserId WHERE `%s` = \'%s\'','left_key_field'=>'AffiliateId','left_title_field'=>'Username','not_null'=>1,'default'=>0),
+										'AffiliateId' => Array('type'=>'int','formatter'=>'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array(0 => 'lu_None'), 'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'Users u ON u.PortalUserId = af.PortalUserId WHERE %s','left_key_field'=>'af.AffiliateId','left_title_field'=>'IF(u.Email = "", u.Username, u.Email)','not_null'=>1,'default'=>0),
 										'PaymentDate' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'default' => '#NOW#'),
 										'Amount' => Array('type' => 'double', 'formatter'=>'kFormatter', 'format'=>'%.02f', 'not_null' => '1', 'required'=>1, 'default' => '0.00'),
 										'Comment' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL),