Index: branches/unlabeled/unlabeled-1.44.2/kernel/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -r5736 -r5856
--- branches/unlabeled/unlabeled-1.44.2/kernel/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 5736)
+++ branches/unlabeled/unlabeled-1.44.2/kernel/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 5856)
@@ -42,10 +42,19 @@
 	</table>
 <inp2:m_blockend/>
 
-<inp2:m_block name="subsection"/>
- <tr class="subsectiontitle">
-  <td colspan="3"><inp2:m_phrase label="$title"/></td>
- </tr>
+<inp2:m_DefineElement name="inp_original_label">
+	<td><inp2:$prefix.original_Field field="$field"/></td>
+</inp2:m_DefineElement>
+
+<inp2:m_block name="subsection" prefix=""/>
+	<tr class="subsectiontitle">
+		<td colspan="3"><inp2:m_phrase label="$title"/></td>
+		<inp2:m_if check="m_ParamEquals" name="prefix" value="" inverse="inverse">
+			<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+				<td><inp2:m_phrase name="$original_title"/></td>
+			</inp2:m_if>
+		</inp2:m_if>
+	</tr>
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_field_caption" subfield="" NamePrefix=""/>
@@ -63,13 +72,16 @@
 		<inp2:m_ParseBlock name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
 		<td valign="top"><span class="text"><inp2:$prefix_Field field="$field" as_label="$as_label" currency="$currency"/></span></td>
     	<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
+    	<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
+		</inp2:m_if>
 	</tr>
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_id_label"/>
-	<inp2:m_if prefix="$prefix" function="FieldEquals" field="$field" value="" inverse="inverse"/>
+	<inp2:m_if check="{$prefix}_FieldEquals" field="$field" value="" inverse="inverse">
 		<inp2:m_ParseBlock name="inp_label" pass_params="true"/>
-	<inp2:m_endif/>
+	</inp2:m_if>
 <inp2:m_blockend/>
 
 <inp2:m_block name="inp_edit_box" subfield="" class="" is_last="" maxlength="" onblur="" size="" onkeyup=""/>
@@ -80,6 +92,9 @@
 			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
 		</td>
 		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
+		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
+		</inp2:m_if>
 	</tr>
 <inp2:m_blockend/>
 
@@ -94,6 +109,9 @@
 			<input type="hidden" name="<inp2:$prefix_InputName field="$field"/>[upload]" id="<inp2:$prefix_InputName field="$field"/>[upload]" value="<inp2:$prefix_Field field="$field"/>">
 		</td>
 		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
+		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
+		</inp2:m_if>
 	</tr>
 <inp2:m_blockend/>
 
@@ -108,6 +126,9 @@
 			<input type="text" name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field" format="no_default"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>" class="<inp2:m_param name="class"/>" onblur="<inp2:m_Param name="onblur"/>">
 		</td>
 		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
+		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
+		</inp2:m_if>
 	</tr>
 <inp2:m_blockend/>
 
@@ -130,6 +151,9 @@
 			<input type="hidden" name="<inp2:$prefix_InputName field="{$field}_time"/>" id="<inp2:$prefix_InputName field="{$field}_time" input_format="1"/>" value="">
 		</td>
 		<td class="error"><inp2:$prefix_Error field="{$field}_date"/>&nbsp;</td>
+		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
+		</inp2:m_if>
 	</tr>
 <inp2:m_blockend/>
 
@@ -151,6 +175,9 @@
 			&nbsp;<input type="text" name="<inp2:$prefix_InputName field="{$field}_time"/>" id="<inp2:$prefix_InputName field="{$field}_time"/>" value="<inp2:$prefix_Field field="{$field}_time" format="_regional_InputTimeFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_time" input_format="1" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>"><span class="small"> (<inp2:$prefix_Format field="{$field}_time" input_format="1" human="true"/>)</span>
 		</td>
 		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
+		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
+		</inp2:m_if>
 	</tr>
 <inp2:m_blockend/>
 
@@ -167,11 +194,12 @@
 			<textarea tabindex="<inp2:m_get param="tab_index"/>" id="<inp2:$prefix_InputName field="$field"/>" name="<inp2:$prefix_InputName field="$field"/>" cols="<inp2:m_param name="cols"/>" rows="<inp2:m_param name="rows"/>" class="<inp2:m_param name="class"/>"><inp2:$prefix_Field field="$field"/></textarea>
 		</td>
 		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
+		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
+		</inp2:m_if>
 	</tr>
 <inp2:m_blockend/>
 
-
-
 <inp2:m_block name="inp_edit_textarea_ml" class=""/>
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<td class="text" valign="top">
@@ -184,6 +212,9 @@
 			<textarea tabindex="<inp2:m_get param="tab_index"/>" id="<inp2:$prefix_InputName field="$field"/>" name="<inp2:$prefix_InputName field="$field"/>" cols="<inp2:m_param name="cols"/>" rows="<inp2:m_param name="rows"/>" class="<inp2:m_param name="class"/>"><inp2:$prefix_Field field="$field"/></textarea>
 		</td>
 		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
+		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
+		</inp2:m_if>
 	</tr>
 <inp2:m_blockend/>
 
@@ -201,6 +232,9 @@
          	</a>
 		</td>
 		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
+		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
+		</inp2:m_if>
 	</tr>
 <inp2:m_blockend/>
 
@@ -226,6 +260,9 @@
 			</select>
 		</td>
 		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
+		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
+		</inp2:m_if>
 	</tr>
 <inp2:m_blockend/>
 
@@ -248,6 +285,9 @@
 			</inp2:m_if>
 		</td>
 		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
+		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
+		</inp2:m_if>
 	</tr>
 <inp2:m_blockend/>
 
@@ -261,6 +301,9 @@
 			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><inp2:m_phrase label="$hint_label"/></inp2:m_if>
 		</td>
 		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
+		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
+		</inp2:m_if>
 	</tr>
 <inp2:m_blockend/>
 
@@ -285,6 +328,9 @@
 			<inp2:m_ParseBlock prefix="$prefix" name="inp_edit_hidden" field="$field"/>
 		</td>
 		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
+		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
+		</inp2:m_if>
 	</tr>
 <inp2:m_blockend/>
 
@@ -318,6 +364,9 @@
 			</inp2:m_if>
 		</td>
 		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
+		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
+		</inp2:m_if>
 	</tr>
 <inp2:m_blockend />
 
Index: branches/unlabeled/unlabeled-1.62.2/core/kernel/db/db_tag_processor.php
===================================================================
diff -u -r5770 -r5856
--- branches/unlabeled/unlabeled-1.62.2/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 5770)
+++ branches/unlabeled/unlabeled-1.62.2/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 5856)
@@ -1555,6 +1555,19 @@
 			$records = array_merge_recursive($records, $heading_records);
 		}
 	}
+	
+	/**
+	 * Allows to determine if original value should be shown
+	 *
+	 * @param Array $params
+	 * @return bool
+	 */
+	function DisplayOriginal($params)
+	{
+		// original id found & greather then zero + show original
+		$display_original = isset($params['display_original']) && $params['display_original'];
+		return $display_original && $this->Application->GetVar($this->Prefix.'.original_id');
+	}
 
 }
 
Index: branches/unlabeled/unlabeled-1.36.2/kernel/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -r5760 -r5856
--- branches/unlabeled/unlabeled-1.36.2/kernel/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 5760)
+++ branches/unlabeled/unlabeled-1.36.2/kernel/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 5856)
@@ -283,12 +283,10 @@
 	</script>
 <inp2:m_blockend/>
 
-<inp2:m_DefineElement name="grid" main_prefix="" per_page="" main_special="" no_toolbar="" grid_filters="" search="on" header_block="grid_column_title" filter_block="grid_column_filter" data_block="grid_data_td" row_block="_row" SourcePrefix="" value_field="Value" ajax="0">
+<inp2:m_DefineElement name="grid" main_prefix="" per_page="" main_special="" no_toolbar="" grid_filters="" search="on" header_block="grid_column_title" filter_block="grid_column_filter" data_block="grid_data_td" row_block="_row" ajax="0">
 <!--
 	grid_filters - show individual filters for each column
 	has_filters  - draw filter section in "View" menu in toolbar
-	SourcePrefix - used with custom fields
-	value_field  - used with custom fields
 -->
 	<inp2:$PrefixSpecial_SaveWarning name="grid_save_warning" main_prefix="$main_prefix" no_toolbar="$no_toolbar"/>
 	<inp2:m_if check="m_RecallEquals" var="{$PrefixSpecial}_search_keyword" value="" inverse="inverse">
@@ -317,12 +315,12 @@
 		</tr>
 
 		<inp2:m_DefineElement name="_row">
-			<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:$PrefixSpecial_field field="$IdField"/>" sequence="<inp2:m_get param="{$PrefixSpecial}_sequence"/>"><inp2:m_inc param="{$PrefixSpecial}_sequence" by="1"/>
-				<inp2:$PrefixSpecial_IterateGridFields grid="$grid" mode="data" block="$data_block"/>
+			<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:Field field="$IdField"/>" sequence="<inp2:m_get param="{$PrefixSpecial}_sequence"/>"><inp2:m_inc param="{$PrefixSpecial}_sequence" by="1"/>
+				<inp2:IterateGridFields grid="$grid" mode="data" block="$data_block"/>
 			</tr>
 		</inp2:m_DefineElement>
 		<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table_color1"/>
-		<inp2:$PrefixSpecial_PrintList block="$row_block" per_page="$per_page" main_special="$main_special" SourcePrefix="$SourcePrefix" value_field="$value_field"/>
+		<inp2:$PrefixSpecial_PrintList block="$row_block" per_page="$per_page" main_special="$main_special" />
 
 	</table>
 
Index: branches/unlabeled/unlabeled-1.7.2/core/admin_templates/incs/custom_blocks.tpl
===================================================================
diff -u -r5727 -r5856
--- branches/unlabeled/unlabeled-1.7.2/core/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 5727)
+++ branches/unlabeled/unlabeled-1.7.2/core/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 5856)
@@ -14,13 +14,13 @@
 
 <inp2:m_DefineElement name="config_edit_select">
 	<select name="<inp2:CustomInputName/>">
-		<inp2:PredefinedOptions field="$field" tabindex="$pass_tabindex" block="config_edit_option" selected="selected"/>
+		<inp2:PredefinedOptions field="$field" block="config_edit_option" selected="selected"/>
 	</select>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_checkbox">
 	<input type="hidden" id="<inp2:CustomInputName/>" name="<inp2:CustomInputName/>" value="<inp2:Field field="$field" db="db"/>">
-	<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:m_param name="field"/>" name="_cb_<inp2:m_param name="field"/>" <inp2:Field field="$field" checked="checked" db="db"/> class="<inp2:m_param name="field_class"/>" onclick="update_checkbox(this, document.getElementById('<inp2:CustomInputName/>'))">
+	<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:m_param name="field"/>" name="_cb_<inp2:m_param name="field"/>" <inp2:Field field="$field" checked="checked" db="db"/> onclick="update_checkbox(this, document.getElementById('<inp2:CustomInputName/>'))">
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_textarea">
@@ -32,7 +32,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_radio">
-			<inp2:PredefinedOptions field="$field" tabindex="$pass_tabindex" block="config_radio_item" selected="checked"/>
+			<inp2:PredefinedOptions field="$field" block="config_radio_item" selected="checked"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_date">
@@ -64,9 +64,12 @@
 <inp2:m_DefineElement name="cv_row_block">
 	<inp2:m_if check="m_ParamEquals" name="show_heading" value="1">
 		<tr class="subsectiontitle">
-			<td colspan="5">
+			<td colspan="3">
 				<inp2:Field name="Heading" as_label="1"/>
 			</td>
+			<inp2:m_if check="{$SourcePrefix}_DisplayOriginal" pass_params="1">
+				<td><inp2:m_phrase name="$original_title"/></td>
+			</inp2:m_if>
 		</tr>
 	</inp2:m_if>
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>" >
@@ -75,6 +78,9 @@
 			<inp2:ConfigFormElement field="Value" blocks_prefix="config_edit_" element_type_field="ElementType" value_list_field="ValueList" />
 		</td>
 		<td class="error"><inp2:CustomError/>&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>
 	</tr>
 </inp2:m_DefineElement>
 
@@ -84,6 +90,11 @@
 	</td>
 </inp2:m_DefineElement>
 
+
+<inp2:m_block name="grid_original_td" />
+	<td valign="top" class="text"><inp2:Field field="$field" grid="$grid"/></td>
+<inp2:m_blockend />
+
 <!--<inp2:m_DefineElement name="edit_custom_td">
 	<td valign="top" class="text">
 		<input type="hidden" name="<inp2:InputName field="ResourceId"/>" id="<inp2:InputName field="ResourceId"/>" value="<inp2:Field field="ResourceId" grid="$grid"/>">
Index: branches/unlabeled/unlabeled-1.7.2/kernel/admin_templates/incs/custom_blocks.tpl
===================================================================
diff -u -r5727 -r5856
--- branches/unlabeled/unlabeled-1.7.2/kernel/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 5727)
+++ branches/unlabeled/unlabeled-1.7.2/kernel/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 5856)
@@ -14,13 +14,13 @@
 
 <inp2:m_DefineElement name="config_edit_select">
 	<select name="<inp2:CustomInputName/>">
-		<inp2:PredefinedOptions field="$field" tabindex="$pass_tabindex" block="config_edit_option" selected="selected"/>
+		<inp2:PredefinedOptions field="$field" block="config_edit_option" selected="selected"/>
 	</select>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_checkbox">
 	<input type="hidden" id="<inp2:CustomInputName/>" name="<inp2:CustomInputName/>" value="<inp2:Field field="$field" db="db"/>">
-	<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:m_param name="field"/>" name="_cb_<inp2:m_param name="field"/>" <inp2:Field field="$field" checked="checked" db="db"/> class="<inp2:m_param name="field_class"/>" onclick="update_checkbox(this, document.getElementById('<inp2:CustomInputName/>'))">
+	<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:m_param name="field"/>" name="_cb_<inp2:m_param name="field"/>" <inp2:Field field="$field" checked="checked" db="db"/> onclick="update_checkbox(this, document.getElementById('<inp2:CustomInputName/>'))">
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_textarea">
@@ -32,7 +32,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_radio">
-			<inp2:PredefinedOptions field="$field" tabindex="$pass_tabindex" block="config_radio_item" selected="checked"/>
+			<inp2:PredefinedOptions field="$field" block="config_radio_item" selected="checked"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_date">
@@ -64,9 +64,12 @@
 <inp2:m_DefineElement name="cv_row_block">
 	<inp2:m_if check="m_ParamEquals" name="show_heading" value="1">
 		<tr class="subsectiontitle">
-			<td colspan="5">
+			<td colspan="3">
 				<inp2:Field name="Heading" as_label="1"/>
 			</td>
+			<inp2:m_if check="{$SourcePrefix}_DisplayOriginal" pass_params="1">
+				<td><inp2:m_phrase name="$original_title"/></td>
+			</inp2:m_if>
 		</tr>
 	</inp2:m_if>
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>" >
@@ -75,6 +78,9 @@
 			<inp2:ConfigFormElement field="Value" blocks_prefix="config_edit_" element_type_field="ElementType" value_list_field="ValueList" />
 		</td>
 		<td class="error"><inp2:CustomError/>&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>
 	</tr>
 </inp2:m_DefineElement>
 
@@ -84,6 +90,11 @@
 	</td>
 </inp2:m_DefineElement>
 
+
+<inp2:m_block name="grid_original_td" />
+	<td valign="top" class="text"><inp2:Field field="$field" grid="$grid"/></td>
+<inp2:m_blockend />
+
 <!--<inp2:m_DefineElement name="edit_custom_td">
 	<td valign="top" class="text">
 		<input type="hidden" name="<inp2:InputName field="ResourceId"/>" id="<inp2:InputName field="ResourceId"/>" value="<inp2:Field field="ResourceId" grid="$grid"/>">
Index: branches/unlabeled/unlabeled-1.2.2/kernel/units/custom_fields/custom_fields_tag_processor.php
===================================================================
diff -u -r5727 -r5856
--- branches/unlabeled/unlabeled-1.2.2/kernel/units/custom_fields/custom_fields_tag_processor.php	(.../custom_fields_tag_processor.php)	(revision 5727)
+++ branches/unlabeled/unlabeled-1.2.2/kernel/units/custom_fields/custom_fields_tag_processor.php	(.../custom_fields_tag_processor.php)	(revision 5856)
@@ -43,6 +43,15 @@
 			return $this->Application->ProcessParsedTag($source_prefix, 'Error', $params);
 		}
 		
+		function setParamValue(&$params, $param_name)
+		{
+			if (!isset($params[$param_name])) {
+				$params[$param_name] = $this->Application->Parser->GetParam($param_name, 1);
+			}
+			
+			return $params[$param_name];
+		}
+		
 		/**
 		 * Prints list content using block specified
 		 *
@@ -52,14 +61,17 @@
 		 */
 		function PrintList($params)
 		{
+			$this->setParamValue($params, 'SourcePrefix');
+			$this->setParamValue($params, 'value_field');
+			
 			$list =& $this->GetList($params);
 			$id_field = $this->Application->getUnitOption($this->Prefix,'IDField');
 	
 			$list->Query();
 			$o = '';
 			$list->GoFirst();
-	
-			$block_params=$this->prepareTagParams($params);
+
+			$block_params = $this->prepareTagParams($params);
 			$block_params['name'] = $this->SelectParam($params, 'render_as,block');
 			$block_params['pass_params'] = 'true';
 			
@@ -69,6 +81,14 @@
 				$source_object =& $this->Application->recallObject($source_prefix);
 			}
 			
+			// $deep_level if GetParam = 1 used in case if PrintList is called during parsing "grid" block (=> +1 to deep_level)
+			$display_original = $this->setParamValue($params, 'display_original');
+			if ($display_original) {
+				$block_params['display_original'] = $display_original;
+				$block_params['original_title'] = $this->setParamValue($params, 'original_title');
+				$original_object =& $this->Application->recallObject($source_prefix.'.original');
+			}
+			
 			if ($this->Special == 'general') {
 				$this->groupRecords($list->Records, 'Heading');
 			}
@@ -79,6 +99,10 @@
 				
 				if ($source_prefix) {				
 					$list->SetDBField($params['value_field'], $source_object->GetDBField('cust_'.$list->GetDBField('FieldName')));
+					if ($display_original) {
+						$list->SetDBField('OriginalValue', $original_object->GetField('cust_'.$list->GetDBField('FieldName')));
+					}
+					$block_params['field'] = 'cust_'.$list->GetDBField('FieldName');
 					$block_params['show_heading'] = ($prev_heading != $list->GetDBField('Heading') ) ? 1 : 0;
 				}
 				
Index: branches/unlabeled/unlabeled-1.73.2/core/kernel/db/db_event_handler.php
===================================================================
diff -u -r5795 -r5856
--- branches/unlabeled/unlabeled-1.73.2/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 5795)
+++ branches/unlabeled/unlabeled-1.73.2/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 5856)
@@ -291,12 +291,13 @@
 		 * @param kEvent $event
 		 * @access private
 		 */
-		function dbBuild(&$object,&$event)
+		function dbBuild(&$object, &$event)
 		{
 			$object->Configure();
 			$this->PrepareObject($object, $event);
 
-			$live_table = $event->getEventParam('live_table');
+			// force live table if specified or is original item
+			$live_table = $event->getEventParam('live_table') || $event->Special == 'original';
 
 			if( $this->UseTempTables($event) && !$live_table )
 			{
@@ -376,6 +377,11 @@
 			return $this->UseTempTables($event) ? $this->Application->GetTempTablePrefix().TABLE_PREFIX : TABLE_PREFIX;
 		}
 
+		/**
+		 * Load item if id is available
+		 *
+		 * @param kEvent $event
+		 */
 		function LoadItem(&$event)
 		{
 			$object =& $event->getObject();
@@ -384,6 +390,11 @@
 			{
 				$actions =& $this->Application->recallObject('kActions');
 				$actions->Set($event->Prefix_Special.'_id', $object->GetID() );
+				
+				$use_pending_editing = $this->Application->getUnitOption($event->Prefix, 'UsePendingEditing');
+				if ($use_pending_editing && $event->Special != 'original') {
+					$this->Application->SetVar($event->Prefix.'.original_id', $object->GetDBField('OrgId'));
+				}
 			}
 			else
 			{
Index: branches/unlabeled/unlabeled-1.10.2/core/units/custom_fields/custom_fields_config.php
===================================================================
diff -u -r5727 -r5856
--- branches/unlabeled/unlabeled-1.10.2/core/units/custom_fields/custom_fields_config.php	(.../custom_fields_config.php)	(revision 5727)
+++ branches/unlabeled/unlabeled-1.10.2/core/units/custom_fields/custom_fields_config.php	(.../custom_fields_config.php)	(revision 5856)
@@ -86,29 +86,41 @@
 										            'IsSystem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'not_null' => '1', 'default' => '0'),
 											),
 					'VirtualFields'	=> 	Array(
-													'Value'	=>	Array('type' => 'string', 'default' => ''),
+													'Value'			=>	Array('type' => 'string', 'default' => ''),
+													'OriginalValue'	=>	Array('type' => 'string', 'default' => ''),
+													
 										),
 											
 					'Grids'	=> Array(
-								'Default'		=>	Array(
+										'Default'		=>	Array(
 																	'Icons' => Array('default'=>'icon16_custom.gif'),
 																	'Fields' => Array(
 																			'CustomFieldId' => Array( 'title'=>'la_prompt_FieldId', 'data_block' => 'grid_checkbox_td' ),
 																			'FieldName' => Array( 'title'=>'la_prompt_FieldName'),
 																			'FieldLabel' => Array( 'title'=>'la_prompt_FieldLabel', 'data_block' => 'cf_grid_data_td' ),
 																			'DisplayOrder' => Array('title' => 'la_prompt_DisplayOrder'),
 																		),
-																	
-														),
-								'SeparateTab'	=>	Array(
+															),
+															
+										'SeparateTab'	=>	Array(
 																	'Icons' => Array('default'=>'icon16_custom.gif'),
 																	'Fields' => Array(
 																			'FieldName' => Array( 'title'=>'la_col_FieldName', 'data_block' => 'grid_icon_td'),
-																			'Prompt' => Array( 'title'=>'la_col_Prompt', 'data_block' => 'grid_data_label_ml_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'),
 																		),
-																),
-																
+															),
+										
+										'SeparateTabOriginal'	=>	Array(
+																			'Icons' => Array('default'=>'icon16_custom.gif'),
+																			'Fields' => Array(
+																					'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'),
+																					'OriginalValue'	=>	Array( 'title'=>'la_col_OriginalValue', 'data_block' => 'grid_original_td'),
+																				),
+																	),
+																		
 								),
 	);
 
Index: branches/unlabeled/unlabeled-1.2.2/core/units/custom_fields/custom_fields_tag_processor.php
===================================================================
diff -u -r5727 -r5856
--- branches/unlabeled/unlabeled-1.2.2/core/units/custom_fields/custom_fields_tag_processor.php	(.../custom_fields_tag_processor.php)	(revision 5727)
+++ branches/unlabeled/unlabeled-1.2.2/core/units/custom_fields/custom_fields_tag_processor.php	(.../custom_fields_tag_processor.php)	(revision 5856)
@@ -43,6 +43,15 @@
 			return $this->Application->ProcessParsedTag($source_prefix, 'Error', $params);
 		}
 		
+		function setParamValue(&$params, $param_name)
+		{
+			if (!isset($params[$param_name])) {
+				$params[$param_name] = $this->Application->Parser->GetParam($param_name, 1);
+			}
+			
+			return $params[$param_name];
+		}
+		
 		/**
 		 * Prints list content using block specified
 		 *
@@ -52,14 +61,17 @@
 		 */
 		function PrintList($params)
 		{
+			$this->setParamValue($params, 'SourcePrefix');
+			$this->setParamValue($params, 'value_field');
+			
 			$list =& $this->GetList($params);
 			$id_field = $this->Application->getUnitOption($this->Prefix,'IDField');
 	
 			$list->Query();
 			$o = '';
 			$list->GoFirst();
-	
-			$block_params=$this->prepareTagParams($params);
+
+			$block_params = $this->prepareTagParams($params);
 			$block_params['name'] = $this->SelectParam($params, 'render_as,block');
 			$block_params['pass_params'] = 'true';
 			
@@ -69,6 +81,14 @@
 				$source_object =& $this->Application->recallObject($source_prefix);
 			}
 			
+			// $deep_level if GetParam = 1 used in case if PrintList is called during parsing "grid" block (=> +1 to deep_level)
+			$display_original = $this->setParamValue($params, 'display_original');
+			if ($display_original) {
+				$block_params['display_original'] = $display_original;
+				$block_params['original_title'] = $this->setParamValue($params, 'original_title');
+				$original_object =& $this->Application->recallObject($source_prefix.'.original');
+			}
+			
 			if ($this->Special == 'general') {
 				$this->groupRecords($list->Records, 'Heading');
 			}
@@ -79,6 +99,10 @@
 				
 				if ($source_prefix) {				
 					$list->SetDBField($params['value_field'], $source_object->GetDBField('cust_'.$list->GetDBField('FieldName')));
+					if ($display_original) {
+						$list->SetDBField('OriginalValue', $original_object->GetField('cust_'.$list->GetDBField('FieldName')));
+					}
+					$block_params['field'] = 'cust_'.$list->GetDBField('FieldName');
 					$block_params['show_heading'] = ($prev_heading != $list->GetDBField('Heading') ) ? 1 : 0;
 				}
 				
Index: branches/unlabeled/unlabeled-1.10.2/kernel/units/custom_fields/custom_fields_config.php
===================================================================
diff -u -r5727 -r5856
--- branches/unlabeled/unlabeled-1.10.2/kernel/units/custom_fields/custom_fields_config.php	(.../custom_fields_config.php)	(revision 5727)
+++ branches/unlabeled/unlabeled-1.10.2/kernel/units/custom_fields/custom_fields_config.php	(.../custom_fields_config.php)	(revision 5856)
@@ -86,29 +86,41 @@
 										            'IsSystem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'not_null' => '1', 'default' => '0'),
 											),
 					'VirtualFields'	=> 	Array(
-													'Value'	=>	Array('type' => 'string', 'default' => ''),
+													'Value'			=>	Array('type' => 'string', 'default' => ''),
+													'OriginalValue'	=>	Array('type' => 'string', 'default' => ''),
+													
 										),
 											
 					'Grids'	=> Array(
-								'Default'		=>	Array(
+										'Default'		=>	Array(
 																	'Icons' => Array('default'=>'icon16_custom.gif'),
 																	'Fields' => Array(
 																			'CustomFieldId' => Array( 'title'=>'la_prompt_FieldId', 'data_block' => 'grid_checkbox_td' ),
 																			'FieldName' => Array( 'title'=>'la_prompt_FieldName'),
 																			'FieldLabel' => Array( 'title'=>'la_prompt_FieldLabel', 'data_block' => 'cf_grid_data_td' ),
 																			'DisplayOrder' => Array('title' => 'la_prompt_DisplayOrder'),
 																		),
-																	
-														),
-								'SeparateTab'	=>	Array(
+															),
+															
+										'SeparateTab'	=>	Array(
 																	'Icons' => Array('default'=>'icon16_custom.gif'),
 																	'Fields' => Array(
 																			'FieldName' => Array( 'title'=>'la_col_FieldName', 'data_block' => 'grid_icon_td'),
-																			'Prompt' => Array( 'title'=>'la_col_Prompt', 'data_block' => 'grid_data_label_ml_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'),
 																		),
-																),
-																
+															),
+										
+										'SeparateTabOriginal'	=>	Array(
+																			'Icons' => Array('default'=>'icon16_custom.gif'),
+																			'Fields' => Array(
+																					'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'),
+																					'OriginalValue'	=>	Array( 'title'=>'la_col_OriginalValue', 'data_block' => 'grid_original_td'),
+																				),
+																	),
+																		
 								),
 	);
 
Index: branches/unlabeled/unlabeled-1.24.2/core/kernel/parser/template_parser.php
===================================================================
diff -u -r5843 -r5856
--- branches/unlabeled/unlabeled-1.24.2/core/kernel/parser/template_parser.php	(.../template_parser.php)	(revision 5843)
+++ branches/unlabeled/unlabeled-1.24.2/core/kernel/parser/template_parser.php	(.../template_parser.php)	(revision 5856)
@@ -77,9 +77,19 @@
 		$this->SortParams(); //Sort once after adding is done
 	}
 
-	function GetParam($name)
+	/**
+	 * Returns parser parameter value at specified deep level
+	 *
+	 * @param string $name
+	 * @param int $deep_level if greather then 0 then use from ParamsStack
+	 * @return mixed
+	 */
+	function GetParam($name, $deep_level = 0)
 	{
-		//return isset($this->Params[strtolower($name)]) ? $this->Params[strtolower($name)] : false;
+		if ($deep_level > 0) {
+			return isset($this->ParamsStack[$deep_level][$name]) ? $this->ParamsStack[$deep_level][$name] : false;
+		}
+		
 		return isset($this->Params[$name]) ? $this->Params[$name] : false;
 	}