Index: branches/unlabeled/unlabeled-1.38.2/kernel/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -r6440 -r6497
--- branches/unlabeled/unlabeled-1.38.2/kernel/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 6440)
+++ branches/unlabeled/unlabeled-1.38.2/kernel/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 6497)
@@ -175,7 +175,9 @@
 
 <inp2:m_block name="grid_data_label_ml_td" format="" />
 	<td valign="top" class="text">
-		<inp2:$PrefixSpecial_field field="$field" grid="$grid" as_label="1" no_special="no_special" format="$format"/>:<br />
+		<span class="<inp2:m_if check="{$SourcePrefix}_HasError" field="$virtual_field">error</inp2:m_if>">
+			<inp2:$PrefixSpecial_Field field="$field" grid="$grid" as_label="1" no_special="no_special" format="$format"/>
+		</span><inp2:m_if check="{$SourcePrefix}_IsRequired" field="$virtual_field"/><span class="error"> *</span></inp2:m_if>:<br />
 		<inp2:m_if check="FieldEquals" field="$ElementTypeField" value="textarea">
 			<a href="javascript:PreSaveAndOpenTranslatorCV('<inp2:m_param name="SourcePrefix"/>,<inp2:m_param name="SourcePrefix"/>-cdata', '<inp2:m_param name="SourcePrefix"/>-cdata:cust_<inp2:Field name="CustomFieldId"/>', 'popups/translator', <inp2:$SourcePrefix_Field field="ResourceId"/>, 1);" title="<inp2:m_Phrase label="la_Translate" escape="1"/>"><img src="img/icons/icon24_translate.gif" style="cursor:hand;" border="0"></a>
 		<inp2:m_else/>
Index: branches/unlabeled/unlabeled-1.8.2/core/admin_templates/incs/custom_blocks.tpl
===================================================================
diff -u -r6492 -r6497
--- branches/unlabeled/unlabeled-1.8.2/core/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 6492)
+++ branches/unlabeled/unlabeled-1.8.2/core/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 6497)
@@ -73,11 +73,11 @@
 		</tr>
 	</inp2:m_if>
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>" >
-		<inp2:m_ParseBlock name="grid_data_label_ml_td" grid="$grid" SourcePrefix="$SourcePrefix" value_field="$value_field" ElementTypeField="ElementType" field="Prompt" PrefixSpecial="$PrefixSpecial"/>
+		<inp2:m_ParseBlock name="grid_data_label_ml_td" grid="$grid" SourcePrefix="$SourcePrefix" virtual_field="$virtual_field" value_field="$value_field" ElementTypeField="ElementType" field="Prompt" PrefixSpecial="$PrefixSpecial"/>
 		<td valign="top" class="text">
 			<inp2:ConfigFormElement field="Value" blocks_prefix="config_edit_" element_type_field="ElementType" value_list_field="ValueList" />
 		</td>
-		<td class="error"><inp2:CustomError/>&nbsp;</td>
+		<td class="error"><inp2:$SourcePrefix_Error field="$virtual_field"/>&nbsp;</td>
 		<inp2:m_if check="{$SourcePrefix}_DisplayOriginal" pass_params="1">
 			<inp2:m_RenderElement prefix="$SourcePrefix" field="$field" name="inp_original_label"/>
 		</inp2:m_if>
@@ -90,6 +90,11 @@
 	</td>
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="custom_error_td">
+	<td valign="top" class="error">
+		<inp2:$SourcePrefix_Error field="$virtual_field"/>
+	</td>
+</inp2:m_DefineElement>
 
 <inp2:m_block name="grid_original_td" />
 	<td valign="top" class="text"><inp2:Field field="$field" grid="$grid"/></td>
Index: branches/unlabeled/unlabeled-1.3.2/kernel/units/custom_fields/custom_fields_tag_processor.php
===================================================================
diff -u -r6438 -r6497
--- branches/unlabeled/unlabeled-1.3.2/kernel/units/custom_fields/custom_fields_tag_processor.php	(.../custom_fields_tag_processor.php)	(revision 6438)
+++ branches/unlabeled/unlabeled-1.3.2/kernel/units/custom_fields/custom_fields_tag_processor.php	(.../custom_fields_tag_processor.php)	(revision 6497)
@@ -36,13 +36,6 @@
 			return $this->Application->ProcessParsedTag($source_prefix, 'InputName', $params);
 		}
 		
-		function CustomError($params)
-		{
-			$params['name'] = $this->GetMainField($params);
-			$source_prefix = $this->Application->Parser->GetParam('SourcePrefix');
-			return $this->Application->ProcessParsedTag($source_prefix, 'Error', $params);
-		}
-		
 		function setParamValue(&$params, $param_name)
 		{
 			// $deep_level if GetParam = 1 used in case if PrintList is called during parsing "grid" block (=> +1 to deep_level)
@@ -103,7 +96,7 @@
 					if ($display_original) {
 						$list->SetDBField('OriginalValue', $original_object->GetField('cust_'.$list->GetDBField('FieldName')));
 					}
-					$block_params['field'] = 'cust_'.$list->GetDBField('FieldName');
+					$block_params['field'] = $block_params['virtual_field'] = 'cust_'.$list->GetDBField('FieldName');
 					$block_params['show_heading'] = ($prev_heading != $list->GetDBField('Heading') ) ? 1 : 0;
 				}
 				
Index: branches/unlabeled/unlabeled-1.8.2/kernel/admin_templates/incs/custom_blocks.tpl
===================================================================
diff -u -r6492 -r6497
--- branches/unlabeled/unlabeled-1.8.2/kernel/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 6492)
+++ branches/unlabeled/unlabeled-1.8.2/kernel/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 6497)
@@ -73,11 +73,11 @@
 		</tr>
 	</inp2:m_if>
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>" >
-		<inp2:m_ParseBlock name="grid_data_label_ml_td" grid="$grid" SourcePrefix="$SourcePrefix" value_field="$value_field" ElementTypeField="ElementType" field="Prompt" PrefixSpecial="$PrefixSpecial"/>
+		<inp2:m_ParseBlock name="grid_data_label_ml_td" grid="$grid" SourcePrefix="$SourcePrefix" virtual_field="$virtual_field" value_field="$value_field" ElementTypeField="ElementType" field="Prompt" PrefixSpecial="$PrefixSpecial"/>
 		<td valign="top" class="text">
 			<inp2:ConfigFormElement field="Value" blocks_prefix="config_edit_" element_type_field="ElementType" value_list_field="ValueList" />
 		</td>
-		<td class="error"><inp2:CustomError/>&nbsp;</td>
+		<td class="error"><inp2:$SourcePrefix_Error field="$virtual_field"/>&nbsp;</td>
 		<inp2:m_if check="{$SourcePrefix}_DisplayOriginal" pass_params="1">
 			<inp2:m_RenderElement prefix="$SourcePrefix" field="$field" name="inp_original_label"/>
 		</inp2:m_if>
@@ -90,6 +90,11 @@
 	</td>
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="custom_error_td">
+	<td valign="top" class="error">
+		<inp2:$SourcePrefix_Error field="$virtual_field"/>
+	</td>
+</inp2:m_DefineElement>
 
 <inp2:m_block name="grid_original_td" />
 	<td valign="top" class="text"><inp2:Field field="$field" grid="$grid"/></td>
Index: branches/unlabeled/unlabeled-1.3.2/core/units/custom_fields/custom_fields_tag_processor.php
===================================================================
diff -u -r6438 -r6497
--- branches/unlabeled/unlabeled-1.3.2/core/units/custom_fields/custom_fields_tag_processor.php	(.../custom_fields_tag_processor.php)	(revision 6438)
+++ branches/unlabeled/unlabeled-1.3.2/core/units/custom_fields/custom_fields_tag_processor.php	(.../custom_fields_tag_processor.php)	(revision 6497)
@@ -36,13 +36,6 @@
 			return $this->Application->ProcessParsedTag($source_prefix, 'InputName', $params);
 		}
 		
-		function CustomError($params)
-		{
-			$params['name'] = $this->GetMainField($params);
-			$source_prefix = $this->Application->Parser->GetParam('SourcePrefix');
-			return $this->Application->ProcessParsedTag($source_prefix, 'Error', $params);
-		}
-		
 		function setParamValue(&$params, $param_name)
 		{
 			// $deep_level if GetParam = 1 used in case if PrintList is called during parsing "grid" block (=> +1 to deep_level)
@@ -103,7 +96,7 @@
 					if ($display_original) {
 						$list->SetDBField('OriginalValue', $original_object->GetField('cust_'.$list->GetDBField('FieldName')));
 					}
-					$block_params['field'] = 'cust_'.$list->GetDBField('FieldName');
+					$block_params['field'] = $block_params['virtual_field'] = 'cust_'.$list->GetDBField('FieldName');
 					$block_params['show_heading'] = ($prev_heading != $list->GetDBField('Heading') ) ? 1 : 0;
 				}
 				
Index: branches/unlabeled/unlabeled-1.33.2/core/units/general/cat_dbitem.php
===================================================================
diff -u -r6126 -r6497
--- branches/unlabeled/unlabeled-1.33.2/core/units/general/cat_dbitem.php	(.../cat_dbitem.php)	(revision 6126)
+++ branches/unlabeled/unlabeled-1.33.2/core/units/general/cat_dbitem.php	(.../cat_dbitem.php)	(revision 6497)
@@ -60,8 +60,9 @@
 
 		$ret = parent::Create();
 		if ($ret) {
+			$primary_category = $this->GetDBField('CategoryId') > 0 ? $this->GetDBField('CategoryId') : $this->Application->GetVar('m_cat_id');
 			$fields_hash = 	Array(
-									'CategoryId'		=>	$this->Application->GetVar('m_cat_id'),
+									'CategoryId'		=>	$primary_category,
 									'ItemResourceId'	=>	$this->GetField('ResourceId'),
 									'PrimaryCat'		=>	1,
 									'ItemPrefix'		=>	$this->Prefix,
Index: branches/unlabeled/unlabeled-1.11.2/core/units/custom_fields/custom_fields_config.php
===================================================================
diff -u -r6098 -r6497
--- branches/unlabeled/unlabeled-1.11.2/core/units/custom_fields/custom_fields_config.php	(.../custom_fields_config.php)	(revision 6098)
+++ branches/unlabeled/unlabeled-1.11.2/core/units/custom_fields/custom_fields_config.php	(.../custom_fields_config.php)	(revision 6497)
@@ -88,6 +88,7 @@
 					'VirtualFields'	=> 	Array(
 													'Value'			=>	Array('type' => 'string', 'default' => ''),
 													'OriginalValue'	=>	Array('type' => 'string', 'default' => ''),
+													'Error'			=>	Array('type' => 'string', 'default' => ''),
 													
 										),
 											
@@ -108,6 +109,7 @@
 																			'FieldName' => Array( 'title'=>'la_col_FieldName', 'data_block' => 'grid_icon_td'),
 																			'Prompt' => Array( 'title'=>'la_col_Prompt', 'data_block' => 'grid_data_label_ml_td', 'ElementTypeField' => 'ElementType'),
 																			'Value' => Array( 'title'=>'la_col_Value', 'data_block' => 'edit_custom_td'),
+																			'Error' => Array( 'title'=>'la_col_Error', 'data_block' => 'custom_error_td'),
 																		),
 															),
 										
Index: branches/unlabeled/unlabeled-1.33.2/kernel/units/general/cat_dbitem.php
===================================================================
diff -u -r6126 -r6497
--- branches/unlabeled/unlabeled-1.33.2/kernel/units/general/cat_dbitem.php	(.../cat_dbitem.php)	(revision 6126)
+++ branches/unlabeled/unlabeled-1.33.2/kernel/units/general/cat_dbitem.php	(.../cat_dbitem.php)	(revision 6497)
@@ -60,8 +60,9 @@
 
 		$ret = parent::Create();
 		if ($ret) {
+			$primary_category = $this->GetDBField('CategoryId') > 0 ? $this->GetDBField('CategoryId') : $this->Application->GetVar('m_cat_id');
 			$fields_hash = 	Array(
-									'CategoryId'		=>	$this->Application->GetVar('m_cat_id'),
+									'CategoryId'		=>	$primary_category,
 									'ItemResourceId'	=>	$this->GetField('ResourceId'),
 									'PrimaryCat'		=>	1,
 									'ItemPrefix'		=>	$this->Prefix,
Index: branches/unlabeled/unlabeled-1.11.2/kernel/units/custom_fields/custom_fields_config.php
===================================================================
diff -u -r6098 -r6497
--- branches/unlabeled/unlabeled-1.11.2/kernel/units/custom_fields/custom_fields_config.php	(.../custom_fields_config.php)	(revision 6098)
+++ branches/unlabeled/unlabeled-1.11.2/kernel/units/custom_fields/custom_fields_config.php	(.../custom_fields_config.php)	(revision 6497)
@@ -88,6 +88,7 @@
 					'VirtualFields'	=> 	Array(
 													'Value'			=>	Array('type' => 'string', 'default' => ''),
 													'OriginalValue'	=>	Array('type' => 'string', 'default' => ''),
+													'Error'			=>	Array('type' => 'string', 'default' => ''),
 													
 										),
 											
@@ -108,6 +109,7 @@
 																			'FieldName' => Array( 'title'=>'la_col_FieldName', 'data_block' => 'grid_icon_td'),
 																			'Prompt' => Array( 'title'=>'la_col_Prompt', 'data_block' => 'grid_data_label_ml_td', 'ElementTypeField' => 'ElementType'),
 																			'Value' => Array( 'title'=>'la_col_Value', 'data_block' => 'edit_custom_td'),
+																			'Error' => Array( 'title'=>'la_col_Error', 'data_block' => 'custom_error_td'),
 																		),
 															),