Index: branches/5.0.x/in-commerce/units/affiliates/affiliates_config.php
===================================================================
diff -u -r12674 -r12699
--- branches/5.0.x/in-commerce/units/affiliates/affiliates_config.php	(.../affiliates_config.php)	(revision 12674)
+++ branches/5.0.x/in-commerce/units/affiliates/affiliates_config.php	(.../affiliates_config.php)	(revision 12699)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: affiliates_config.php 12500 2009-09-15 16:27:57Z dmitrya $
+* @version	$Id: affiliates_config.php 12699 2009-10-20 08:09:13Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -168,15 +168,15 @@
 										'AffiliatePlanId' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options_sql'=>'SELECT Name, AffiliatePlanId FROM '.TABLE_PREFIX.'AffiliatePlans WHERE Enabled = 1 ORDER BY Name', 'option_key_field'=>'AffiliatePlanId', 'option_title_field'=>'Name', 'not_null' => 1, 'default' => 0),
 										'AccumulatedAmount' => Array('type' => 'double', 'formatter'=>'kFormatter', 'format'=>'%.02f', 'not_null' => '1','default' => '0.00'),
 										'AmountToPay' => Array('type' => 'double', 'formatter'=>'kFormatter', 'format'=>'%.02f', 'not_null' => '1','default' => '0.00'),
-										'LastPaymentDate' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'default' => null),
-										'LastOrderDate' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null),
+										'LastPaymentDate' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'default' => NULL),
+										'LastOrderDate' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL),
 										'Status' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array(1=>'la_Active', 2=>'la_Pending', 0=>'la_Disabled'), 'use_phrases'=>1, 'not_null' => '1','default' => 2),
 										'AffiliateCode' => Array('type' => 'string', 'not_null' => '1', 'default' => ''),
 										'ItemsSold' => Array('type' => 'int', 'not_null' => 1, 'default' => 0),
 										'PaymentTypeId' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options' => Array(0 => ''), 'options_sql'=>'SELECT Name, PaymentTypeId FROM '.TABLE_PREFIX.'AffiliatePaymentTypes WHERE Status = 1 ORDER BY IsPrimary DESC, Priority DESC, Name ASC', 'option_key_field'=>'PaymentTypeId', 'option_title_field'=>'Name', 'not_null' => 1, 'default' => 0),
 										'SSN' => Array('type' => 'string','not_null' => '1','default' => '', 'required' => 1),
-										'Comments' => Array('type' => 'string', 'formatter' => 'kFormatter', 'not_null' => 1, 'using_fck' => 1, 'default' => ''),
-										'CreatedOn' => Array('type' => 'int', 'formatter'=>'kDateFormatter',  'not_null' => '1', 'default' => '#NOW#'),
+										'Comments' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL),
+										'CreatedOn' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
 								),
 					'VirtualFields'	=> 	Array(
 												'UserName' => Array('type'=>'string', 'default' => ''),