Index: branches/5.2.x/units/downloads/download_helper.php
===================================================================
diff -u -N -r14618 -r14655
--- branches/5.2.x/units/downloads/download_helper.php	(.../download_helper.php)	(revision 14618)
+++ branches/5.2.x/units/downloads/download_helper.php	(.../download_helper.php)	(revision 14655)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: download_helper.php 14618 2011-10-04 08:38:52Z alex $
+* @version	$Id: download_helper.php 14655 2011-10-11 15:44:35Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -26,6 +26,7 @@
 		function SendFile($file_id, $product_id)
 		{
 			$file_object =& $this->Application->recallObject('file', null, Array('skip_autoload' => true));
+			/* @var $file_object kDBItem */
 
 			$sql = $file_id ?
 						'SELECT FileId, FilePath, RealPath, MIMEType FROM '.$this->Application->getUnitOption('file', 'TableName').'
@@ -34,7 +35,7 @@
 							WHERE ProductId = '.$product_id.' AND IsPrimary = 1';
 			$file_info = $this->Conn->GetRow($sql);
 
-			$field_options = $file_object->getFieldOptions('RealPath');
+			$field_options = $file_object->GetFieldOptions('RealPath');
 			$file_info['real_path'] = FULL_PATH.$field_options['upload_dir'].'/'.$file_info['RealPath'];
 			$file_info = $this->DoSendFile($file_info);
 			return $file_info;
Index: branches/5.2.x/units/products/products_config.php
===================================================================
diff -u -N -r14582 -r14655
--- branches/5.2.x/units/products/products_config.php	(.../products_config.php)	(revision 14582)
+++ branches/5.2.x/units/products/products_config.php	(.../products_config.php)	(revision 14655)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: products_config.php 14582 2011-09-23 14:42:51Z alex $
+* @version	$Id: products_config.php 14655 2011-10-11 15:44:35Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -454,7 +454,7 @@
 					    'DescriptionExcerpt'	=>	Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'using_fck' => 1, 'default' => NULL),
 					    'Weight'				=>	Array ('type' => 'float', 'min_value_exc' => 0, 'formatter' => 'kUnitFormatter', 'format' => '%0.2f', 'default' => NULL),
 					    'MSRP'					=>	Array ('type' => 'float', 'min_value_inc' => 0, 'formatter' => 'kFormatter', 'format' => '%0.2f', 'default' => NULL),
-					    'ManufacturerId'		=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' =>Array (0 => ''), 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Manufacturers ORDER BY Name', 'option_key_field' => 'ManufacturerId', 'option_title_field' => 'Name', 'not_null' => 1, 'default' => 0),
+					    'ManufacturerId'		=>	Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Manufacturers ORDER BY Name', 'option_key_field' => 'ManufacturerId', 'option_title_field' => 'Name', 'not_null' => 1, 'default' => 0),
 					    'Status'				=>	Array (
 					    	'type' => 'int',
 					    	'formatter' => 'kOptionsFormatter',
Index: branches/5.2.x/units/affiliate_payments/affiliate_payments_event_handler.php
===================================================================
diff -u -N -r14625 -r14655
--- branches/5.2.x/units/affiliate_payments/affiliate_payments_event_handler.php	(.../affiliate_payments_event_handler.php)	(revision 14625)
+++ branches/5.2.x/units/affiliate_payments/affiliate_payments_event_handler.php	(.../affiliate_payments_event_handler.php)	(revision 14655)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: affiliate_payments_event_handler.php 14625 2011-10-04 09:34:12Z alex $
+* @version	$Id: affiliate_payments_event_handler.php 14655 2011-10-11 15:44:35Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -36,7 +36,7 @@
 			$parent_object =& $this->Application->recallObject($parent_info['ParentPrefix']);
 			/* @var $parent_object kDBItem */
 
-			$options = $object->getFieldOptions('PaymentTypeId');
+			$options = $object->GetFieldOptions('PaymentTypeId');
 
 			if ( $parent_object->isLoaded() ) {
 				$options['default'] = $parent_object->GetDBField('PaymentTypeId');
Index: branches/5.2.x/admin_templates/products/products_edit.tpl
===================================================================
diff -u -N -r14258 -r14655
--- branches/5.2.x/admin_templates/products/products_edit.tpl	(.../products_edit.tpl)	(revision 14258)
+++ branches/5.2.x/admin_templates/products/products_edit.tpl	(.../products_edit.tpl)	(revision 14655)
@@ -107,7 +107,7 @@
 				</td>
 			</tr>
 
-			<inp2:m_RenderElement name="inp_edit_options" prefix="p" field="ManufacturerId" title="la_fld_Manufacturer" size="4"/>
+			<inp2:m_RenderElement name="inp_edit_options" prefix="p" field="ManufacturerId" title="la_fld_Manufacturer" size="4" has_empty="1"/>
 
 			<inp2:m_if check="p_FieldEquals" field="Type" value="3">
 				<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="Price" title="la_fld_Price" size="5"/>