in-commerce
No OneTemporary
Actions

Subscribers

None

File Metadata

Created: Sun, Jan 5, 10:30 PM

in-commerce
View Options

	Index: branches/5.1.x/admin_templates/export.tpl
	===================================================================
	--- branches/5.1.x/admin_templates/export.tpl (revision 13922)
	+++ branches/5.1.x/admin_templates/export.tpl (revision 13923)
	@@ -1,128 +1,124 @@
	<inp2:adm_SetPopupSize width="780" height="670"/>

	<inp2:m_include t="incs/header"/>
	<inp2:m_RenderElement name="combined_header" prefix="p.export" section="in-portal:browse" perm_section="PRODUCT" permission_type="VIEW" system_permission="0" title_preset="products_export"/>

	<!-- ToolBar -->
	<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
	<tbody>
	<tr>
	<td>
	<script type="text/javascript">
	a_toolbar = new ToolBar();
	a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {

	document.getElementById('hidden_export_columns').value = select_to_string('<inp2:p.export_InputName field="ExportColumns"/>');
	submit_event('p.export','OnExportBegin');

	}
	) );
	a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
	submit_event('p.export','OnGoBack');
	}
	) );

	a_toolbar.Render();
	</script>
	</td>
	</tr>
	</tbody>
	</table>


	<inp2:p.export_SaveWarning name="grid_save_warning"/>
	<inp2:p.export_ErrorWarning name="form_error_warning"/>

	<div id="scroll_container">
	<table class="edit-form">
	<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>

	<inp2:m_RenderElement name="inp_edit_radio" prefix="p.export" field="ExportFormat" title="la_fld_ExportFormat" use_phrases="0"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="p.export" field="FieldsSeparatedBy" title="la_fld_FieldsSeparatedBy" size="2" maxlength="1"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="p.export" field="FieldsEnclosedBy" title="la_fld_FieldsEnclosedBy" size="2" maxlength="1"/>
	<inp2:m_RenderElement name="inp_edit_radio" prefix="p.export" field="LineEndings" title="la_fld_LineEndings" use_phrases="0"/>
	<inp2:m_RenderElement name="inp_edit_radio" prefix="p.export" field="LineEndingsInside" title="la_fld_LineEndingsInside" use_phrases="0"/>

	<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p.export" field="IncludeFieldTitles" title="la_fld_IncludeFieldTitles"/>

	- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
	- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="p.export" field="ExportColumns" title="la_fld_ExportColumns"/>
	+ <inp2:m_RenderElement design="form_row" prefix="p.export" field="ExportColumns" title="la_fld_ExportColumns">
	<td class="control-cell">
	<table cellpadding="0" cellspacing="0" border="0">
	<tr>
	<td>
	<input type="button" value="<inp2:m_phrase name="la_btn_Up"/>" onclick="move_options_up('<inp2:p.export_InputName field="ExportColumns"/>', 1)" class="button">
	<input type="button" value="<inp2:m_phrase name="la_btn_Down"/>" onclick="move_options_down('<inp2:p.export_InputName field="ExportColumns"/>', 1)" class="button"><br />
	<img src="img/spacer.gif" width="1" height="5" alt=""><br />
	</td>
	<td><img src="img/spacer.gif" width="45" height="1" alt=""><br></td>
	<td><inp2:m_phrase name="la_fld_AvailableColumns"/>:</td>
	</tr>
	<tr>
	<td>
	<select multiple id="<inp2:p.export_InputName field="ExportColumns"/>" size="15" style="width: 225px;">
	<inp2:p.export_PredefinedOptions field="ExportColumns" block="inp_option_item" selected="selected"/>
	</select>
	<input type="hidden" id="hidden_export_columns" name="<inp2:p.export_InputName field="ExportColumns"/>" value="<inp2:p.export_Field field="ExportColumns"/>" />
	</td>
	<td align="center">
	<input type="button" value=" «« " onclick="move_selected('<inp2:p.export_InputName field="AvailableColumns"/>', '<inp2:p.export_InputName field="ExportColumns"/>')" class="button"><br>
	<img src="img/spacer.gif" width="1" height="4" alt=""><br>
	<input type="button" value=" »» " onclick="move_selected('<inp2:p.export_InputName field="ExportColumns"/>', '<inp2:p.export_InputName field="AvailableColumns"/>'); select_sort('<inp2:p.export_InputName field="AvailableColumns"/>');" class="button">
	</td>
	<td>
	<select multiple id="<inp2:p.export_InputName field="AvailableColumns"/>" size="15" style="width: 225px;">
	<inp2:p.export_PredefinedOptions field="AvailableColumns" block="inp_option_item" selected="selected"/>
	</select>
	</td>
	</tr>
	</table>
	</td>
	- <inp2:m_RenderElement name="inp_edit_error" prefix="p.export" field="ExportColumns"/>
	- </tr>
	+ </inp2:m_RenderElement>

	- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
	- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="p.export" field="CategoryFormat" title="la_fld_CategoryFormat"/>
	+ <inp2:m_RenderElement design="form_row" prefix="p.export" field="CategoryFormat" title="la_fld_CategoryFormat">
	<td class="control-cell">
	<table cellspacing="0" cellpadding="0">
	<tr>
	<td rowspan="2" valign="top">
	<input type="radio"<inp2:m_if check="p.export_FieldEquals" field="CategoryFormat" value="1"> checked</inp2:m_if> name="<inp2:p.export_InputName field="CategoryFormat"/>" id="<inp2:p.export_InputName field="CategoryFormat"/>_1" value="1" />
	</td>
	<td>
	<label for="<inp2:p.export_InputName field="CategoryFormat"/>_1"><inp2:m_phrase label="la_MixedCategoryPath"/></label>
	</td>
	</tr>
	<tr>
	<td>
	<span class="<inp2:m_if check="p.export_HasError" field="CategorySeparator">error</inp2:m_if>"><inp2:m_phrase name="la_fld_CategorySeparator"/></span><inp2:m_if check="p.export_IsRequired" field="CategorySeparator"><span class="error"> *</span></inp2:m_if>:
	<input type="text" name="<inp2:p.export_InputName field="CategorySeparator"/>" id="<inp2:p.export_InputName field="CategorySeparator"/>" value="<inp2:p.export_Field field="CategorySeparator"/>" size="2" maxlength="1" /><br />
	(will look like "Category:Sub-category:Sub-sub-category")

	</td>
	</tr>

	<tr>
	<td rowspan="2" valign="top">
	<input type="radio"<inp2:m_if check="p.export_FieldEquals" field="CategoryFormat" value="2"> checked</inp2:m_if> name="<inp2:p.export_InputName field="CategoryFormat"/>" id="<inp2:p.export_InputName field="CategoryFormat"/>_2" value="2" />
	</td>
	<td>
	<label for="<inp2:p.export_InputName field="CategoryFormat"/>_2"><inp2:m_phrase label="la_SeparatedCategoryPath"/></label><br />
	(the fields will be titled Category1..CategoryN accordingly)
	</td>
	</tr>
	</table>
	</td>
	- <inp2:m_RenderElement name="inp_edit_error" prefix="p.export" field="CategoryFormat"/>
	- </tr>
	+ </inp2:m_RenderElement>

	<inp2:m_if check="m_GetEquals" name="m_cat_id" value="0" inverse="inverse">
	<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p.export" field="IsBaseCategory" title="la_fld_IsBaseCategory" />
	</inp2:m_if>

	<inp2:m_RenderElement name="inp_edit_box" prefix="p.export" field="ExportFilename" title="la_fld_ExportFilename" size="20" />
	<inp2:m_RenderElement name="inp_edit_filler"/>
	</table>
	</div>

	<inp2:m_include t="incs/footer"/>
	\ No newline at end of file
	Index: branches/5.1.x/admin_templates/shipping/shipping_quote_engine_edit.tpl
	===================================================================
	--- branches/5.1.x/admin_templates/shipping/shipping_quote_engine_edit.tpl (revision 13922)
	+++ branches/5.1.x/admin_templates/shipping/shipping_quote_engine_edit.tpl (revision 13923)
	@@ -1,116 +1,112 @@
	<inp2:adm_SetPopupSize width="780" height="580"/>

	<inp2:m_include t="incs/header"/>
	<inp2:m_RenderElement name="combined_header" prefix="sqe" section="in-commerce:shipping_quote_engines" title_preset="engine_edit"/>

	<!-- ToolBar -->
	<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
	<tbody>
	<tr>
	<td>
	<script type="text/javascript">
	a_toolbar = new ToolBar();
	a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
	submit_event('sqe','<inp2:sqe_SaveEvent/>');
	}
	) );
	a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
	submit_event('sqe','OnCancelEdit');
	}
	) );

	a_toolbar.Render();
	</script>
	</td>
	</tr>
	</tbody>
	</table>

	<inp2:m_DefineElement name="carrier">
	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
	<inp2:m_inc param="tab_index" by="1"/>
	<td class="label-cell">
	<input type="hidden" id="<inp2:sqe_InputName field="{$carrier}Enabled"/>" name="<inp2:sqe_InputName field="{$carrier}Enabled"/>" value="<inp2:sqe_Field field="{$carrier}Enabled" db="db"/>">
	<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:sqe_InputName field="{$carrier}Enabled"/>" name="_cb_<inp2:sqe_InputName field="{$carrier}Enabled"/>" <inp2:sqe_Field field="{$carrier}Enabled" checked="checked" db="db"/> onclick="update_checkbox(this, document.getElementById('<inp2:sqe_InputName field="{$carrier}Enabled"/>'))" onchange="check_carrier('_cb_<inp2:sqe_InputName field="{$carrier}Enabled"/>', '<inp2:sqe_InputName field="{$carrier}Account" />', '_cb_<inp2:sqe_InputName field="{$carrier}Invoiced"/>')">

	<inp2:m_param name="title" />
	</td>
	<td class="control-mid"> </td>
	<td class="control-cell">
	<inp2:m_phrase label="la_AccountLogin" />:
	<input type="text" name="<inp2:sqe_InputName field="{$carrier}Account" />" id="<inp2:sqe_InputName field="{$carrier}Account" />" value="<inp2:sqe_Field field="{$carrier}Account" />" tabindex="<inp2:m_get param="tab_index"/>">

	<inp2:m_phrase label="la_Invoiced" />:
	<input type="hidden" id="<inp2:sqe_InputName field="{$carrier}Invoiced"/>" name="<inp2:sqe_InputName field="{$carrier}Invoiced"/>" value="<inp2:sqe_Field field="{$carrier}Invoiced" db="db"/>">
	<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:sqe_InputName field="{$carrier}Invoiced"/>" name="_cb_<inp2:sqe_InputName field="{$carrier}Invoiced"/>" <inp2:sqe_Field field="{$carrier}Invoiced" checked="checked" db="db"/> onclick="update_checkbox(this, document.getElementById('<inp2:sqe_InputName field="{$carrier}Invoiced"/>'))">
	</td>
	</tr>
	<script type="text/javascript">
	check_carrier('_cb_<inp2:sqe_InputName field="{$carrier}Enabled"/>', '<inp2:sqe_InputName field="{$carrier}Account" />', '_cb_<inp2:sqe_InputName field="{$carrier}Invoiced"/>');
	</script>
	</inp2:m_DefineElement>

	<script type="text/javascript">

	function check_carrier(carrier_checkbox, account_field, invoiced_checkbox)
	{
	if(document.getElementById(carrier_checkbox).checked)
	{
	document.getElementById(account_field).disabled = false;
	document.getElementById(invoiced_checkbox).disabled = false;
	}
	else
	{
	document.getElementById(account_field).disabled = true;
	document.getElementById(invoiced_checkbox).disabled = true;
	}
	}

	</script>

	<inp2:sqe_SaveWarning name="grid_save_warning"/>
	<inp2:sqe_ErrorWarning name="form_error_warning"/>

	<div id="scroll_container">
	<table class="edit-form">
	<inp2:m_RenderElement name="subsection" title="!la_Text_General!"/>
	<inp2:m_RenderElement name="inp_label" prefix="sqe" field="EngineId" title="!la_fld_Id!"/>
	<inp2:m_RenderElement name="inp_label" prefix="sqe" field="Name" title="!la_fld_ShippingQuoteEngineName!"/>
	<inp2:m_RenderElement name="inp_edit_checkbox" prefix="sqe" field="Status" title="!la_fld_Enabled!"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="sqe" field="AccountLogin" title="!la_fld_Login!" />

	- <inp2:m_if check="sqe_FieldVisible" field="AccountPassword">
	- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
	- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="sqe" field="AccountPassword" title="!la_fld_Password!" />
	- <td class="control-cell">
	- <input type="password" name="<inp2:sqe_InputName field="AccountPassword" />" id="<inp2:sqe_InputName field="AccountPassword" />" value="">
	- </td>
	- <inp2:m_RenderElement name="inp_edit_error" prefix="sqe" field="AccountPassword"/>
	- </tr>
	- </inp2:m_if>
	+ <inp2:m_RenderElement design="form_row" prefix="sqe" field="AccountPassword" title="la_fld_Password">
	+ <td class="control-cell">
	+ <input type="password" name="<inp2:sqe_InputName field="AccountPassword" />" id="<inp2:sqe_InputName field="AccountPassword" />" value="">
	+ </td>
	+ </inp2:m_RenderElement>

	<inp2:m_if check="sqe_Field" field="ClassName" equals_to="Intershipper" db="db">
	<inp2:m_RenderElement name="subsection" title="!la_Text_Carriers!"/>
	<inp2:m_RenderElement name="carrier" carrier="UPS" title="UPS" />
	<inp2:m_RenderElement name="carrier" carrier="FDX" title="FedEx" />
	<inp2:m_RenderElement name="carrier" carrier="DHL" title="DHL" />
	<inp2:m_RenderElement name="carrier" carrier="USP" title="USPS" />
	<inp2:m_RenderElement name="carrier" carrier="ARB" title="Airborne" />

	<inp2:m_RenderElement name="subsection" title="!la_Text_Delivery!"/>
	<inp2:m_RenderElement name="inp_edit_checkbox" prefix="sqe" field="1DYEnabled" title="!la_fld_FirstDayDelivery!"/>
	<inp2:m_RenderElement name="inp_edit_checkbox" prefix="sqe" field="2DYEnabled" title="!la_fld_SecondDayDelivery!"/>
	<inp2:m_RenderElement name="inp_edit_checkbox" prefix="sqe" field="3DYEnabled" title="!la_fld_ThirdDayDelivery!"/>
	<inp2:m_RenderElement name="inp_edit_checkbox" prefix="sqe" field="GNDEnabled" title="!la_fld_GroundDelivery!"/>

	<inp2:m_RenderElement name="subsection" title="!la_Text_Other!"/>
	<inp2:m_RenderElement name="inp_edit_options" prefix="sqe" field="ShipMethod" title="!la_fld_ShipMethod!"/>

	<inp2:m_RenderElement name="inp_edit_box" prefix="sqe" field="FlatSurcharge" title="!la_fld_FlatSurcharge!" size="10"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="sqe" field="PercentSurcharge" title="!la_fld_PercentSurcharge!" size="10"/>
	</inp2:m_if>
	<inp2:m_RenderElement name="inp_edit_filler"/>
	</table>
	</div>

	<inp2:m_include t="incs/footer"/>
	\ No newline at end of file
	Index: branches/5.1.x/admin_templates/shipping/shipping_costs.tpl
	===================================================================
	--- branches/5.1.x/admin_templates/shipping/shipping_costs.tpl (revision 13922)
	+++ branches/5.1.x/admin_templates/shipping/shipping_costs.tpl (revision 13923)
	@@ -1,220 +1,216 @@
	<inp2:adm_SetPopupSize width="850" height="610"/>

	<inp2:m_include t="incs/header"/>
	<inp2:m_RenderElement name="combined_header" prefix="s" section="in-commerce:shipping" title_preset="costs" tab_preset="Default"/>

	<!-- ToolBar -->
	<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
	<tbody>
	<tr>
	<td>
	<script type="text/javascript">
	var $checked_count = 0;

	a_toolbar = new ToolBar();
	a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
	submit_event('s','<inp2:s_SaveEvent/>');
	}
	) );
	a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
	submit_event('s','OnCancelEdit');
	}
	) );

	a_toolbar.AddButton( new ToolBarSeparator('sep1') );

	a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
	go_to_id('s', '<inp2:s_PrevId/>');
	}
	) );
	a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
	go_to_id('s', '<inp2:s_NextId/>');
	}
	) );

	a_toolbar.AddButton( new ToolBarSeparator('sep2') );

	a_toolbar.AddButton( new ToolBarButton('in-commerce:flip', '<inp2:m_phrase label="la_ToolTip_Flip" escape="1"/>',
	function() {
	submit_event('s','OnFlip');
	} ) );

	a_toolbar.AddButton( new ToolBarButton('in-commerce:clear_all', '<inp2:m_phrase label="la_ToolTip_ClearAll" escape="1"/>', function() {
	if(confirm('<inp2:m_phrase label="la_ClearCostsWarning"/>'))
	submit_event('sc','OnClearAll');
	}
	) );

	a_toolbar.AddButton( new ToolBarButton('in-commerce:modify', '<inp2:m_phrase label="la_ToolTip_Modify" escape="1"/>',
	function() {
	openSelector('s', '<inp2:m_t t="in-commerce/shipping/modify_selector" pass="all,sc" sc_event="OnSaveCreated"/>');
	} ) );
	a_toolbar.Render();

	a_toolbar.DisableButton('modify');

	<inp2:m_if check="s_IsSingle" >
	a_toolbar.HideButton('prev');
	a_toolbar.HideButton('next');
	a_toolbar.HideButton('sep1');
	<inp2:m_else/>
	<inp2:m_if check="s_IsLast" >
	a_toolbar.DisableButton('next');
	</inp2:m_if>
	<inp2:m_if check="s_IsFirst" >
	a_toolbar.DisableButton('prev');
	</inp2:m_if>
	</inp2:m_if>

	function reflect_toolbar($prefix_special, $id, $field)
	{
	var $element = document.getElementById($prefix_special+'['+$id+']['+$field+']');
	if($element.checked)
	{
	$checked_count++;
	}
	else
	{
	$checked_count--;
	}

	if($checked_count)
	{
	a_toolbar.EnableButton('modify');
	}
	else
	{
	a_toolbar.DisableButton('modify');
	}
	}

	</script>
	</td>
	</tr>
	</tbody>
	</table>

	-<inp2:m_DefineElement name="precision_field">
	- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
	- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field_name="$field" title="$title"/>
	- <td class="control-cell">
	- <select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="PrecisionBeforeSep"/>" id="<inp2:{$prefix}_InputName field="PrecisionBeforeSep"/>">
	- <inp2:m_if check="m_ParamEquals" name="use_phrases" value="1" >
	- <inp2:{$prefix}_PredefinedOptions field="PrecisionBeforeSep" block="inp_option_phrase" selected="selected"/>
	- <inp2:m_else/>
	- <inp2:{$prefix}_PredefinedOptions field="PrecisionBeforeSep" block="inp_option_item" selected="selected"/>
	- </inp2:m_if>
	- </select> , <select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="PrecisionAfterSep"/>" id="<inp2:{$prefix}_InputName field="PrecisionAfterSep"/>">
	- <inp2:m_if check="m_ParamEquals" name="use_phrases" value="1" >
	- <inp2:{$prefix}_PredefinedOptions field="PrecisionAfterSep" block="inp_option_phrase" selected="selected"/>
	- <inp2:m_else/>
	- <inp2:{$prefix}_PredefinedOptions field="PrecisionAfterSep" block="inp_option_item" selected="selected"/>
	- </inp2:m_if>
	- </select>
	- </td>
	- </tr>
	-</inp2:m_DefineElement>
	-
	-
	<inp2:m_DefineElement name="row_header">
	<td>
	<input type="checkbox" name="<inp2:{$prefix}_InputName field="$IdField"/>" id="<inp2:{$prefix}_InputName field="$IdField"/>" value="<inp2:{$prefix}_field field="$IdField"/>" onclick="reflect_toolbar('<inp2:m_param name="prefix"/>', <inp2:{$prefix}_field field="$IdField"/>, '<inp2:m_param name="IdField"/>')">
	<inp2:m_RenderElement name="$header_caption"/>
	<a href="javascript:propagate_values('<inp2:m_param name="prefix"/>', <inp2:{$prefix}_field field="$IdField"/>)"><img src="<inp2:m_TemplatesBase module='In-Commerce'/>/img/list_horiz_propagate.gif" alt="<inp2:m_phrase label="la_PropagateValues"/>" border="0"></a>
	</td>
	</inp2:m_DefineElement>

	<inp2:m_DefineElement name="column_header">
	<td align="center" style="border-left:1px solid black">
	<input type="checkbox" name="<inp2:{$prefix}_InputName field="$IdField"/>" id="<inp2:{$prefix}_InputName field="$IdField"/>" value="<inp2:{$prefix}_field field="$IdField"/>" onclick="reflect_toolbar('<inp2:m_param name="prefix"/>', <inp2:{$prefix}_field field="$IdField"/>, '<inp2:m_param name="IdField"/>')">
	<inp2:m_RenderElement name="$header_caption"/>
	<a href="javascript:propagate_values('<inp2:m_param name="prefix"/>', <inp2:{$prefix}_field field="$IdField"/>)"><img src="<inp2:m_TemplatesBase module='In-Commerce'/>/img/list_vertic_propagate.gif" alt="<inp2:m_phrase label="la_PropagateValues"/>" border="0"></a>
	</td>
	</inp2:m_DefineElement>

	<inp2:m_DefineElement name="zone_caption">
	<nobr><inp2:z_field field="Name"/></nobr>
	</inp2:m_DefineElement>

	<inp2:m_DefineElement name="bracket_caption">
	<inp2:m_if check="s_FieldEquals" name="Type" value="1">
	<inp2:m_if check="lang.current_FieldEquals" field="UnitSystem" value="1">
	<inp2:br_field field="Start"/> <inp2:m_Phrase label="la_kg" /> - <inp2:m_if check="br_fieldequals" field="End" value="-1">∞<inp2:m_else/><inp2:br_field field="End"/> <inp2:m_Phrase label="la_kg" /></inp2:m_if>
	</inp2:m_if>
	<inp2:m_if check="lang.current_FieldEquals" field="UnitSystem" value="2">
	<inp2:br_field field="Start_a"/> <inp2:m_Phrase label="la_lbs" /> <inp2:br_field field="Start_b"/> <inp2:m_Phrase label="la_oz" /> - <inp2:m_if check="br_fieldequals" field="End" value="-1">∞<inp2:m_else/><inp2:br_field field="End_a"/> <inp2:m_Phrase label="la_lbs" /> <inp2:br_field field="End_b"/> <inp2:m_Phrase label="la_oz" /></inp2:m_if>
	</inp2:m_if>
	<inp2:m_else />
	<nobr><inp2:br_field field="Start"/> - <inp2:m_if check="br_fieldequals" field="End" value="-1">∞<inp2:m_else/><inp2:br_field field="End" /></inp2:m_if></nobr>
	</inp2:m_if>
	</inp2:m_DefineElement>

	<inp2:m_DefineElement name="cost_cell">
	<td style="border-left:1px solid black" align="center">
	<nobr>$ <input type="text" maxlength="<inp2:s_CostInputSize/>" size="<inp2:s_CostInputSize/>" name="<inp2:sc_InputName field="Flat"/><inp2:m_if check="s_fieldequals" field="CostType" value="2">_input</inp2:m_if>" id="<inp2:sc_InputName field="Flat"/><inp2:m_if check="s_fieldequals" field="CostType" value="2" >_input</inp2:m_if>" value="<inp2:sc_field field="Flat" />"<inp2:m_if check="s_fieldequals" field="CostType" value="2" > disabled</inp2:m_if>>
	% <input type="text" maxlength="<inp2:s_CostInputSize/>" size="<inp2:s_CostInputSize/>" name="<inp2:sc_InputName field="PerUnit"/><inp2:m_if check="s_fieldequals" field="CostType" value="1">_input</inp2:m_if>" id="<inp2:sc_InputName field="PerUnit"/><inp2:m_if check="s_fieldequals" field="CostType" value="1" >_input</inp2:m_if>" value="<inp2:sc_field field="PerUnit" />"<inp2:m_if check="s_fieldequals" field="CostType" value="1" > disabled</inp2:m_if>></nobr>

	<inp2:m_if check="s_fieldequals" field="CostType" value="2" >
	<input type="hidden" name="<inp2:sc_InputName field="Flat"/>" id="<inp2:sc_InputName field="Flat"/>" value="<inp2:sc_field field="Flat"/>">
	</inp2:m_if>
	<inp2:m_if check="s_fieldequals" field="CostType" value="1" >
	<input type="hidden" name="<inp2:sc_InputName field="PerUnit"/>" id="<inp2:sc_InputName field="PerUnit"/>" value="<inp2:sc_field field="PerUnit"/>">
	</inp2:m_if>

	<input type="hidden" name="<inp2:sc_InputName field="BracketId"/>" id="<inp2:sc_InputName field="BracketId"/>" value="<inp2:br_field field="BracketId"/>">
	<input type="hidden" name="<inp2:sc_InputName field="ZoneID"/>" id="<inp2:sc_InputName field="ZoneID"/>" value="<inp2:z_field field="ZoneID"/>">
	</td>
	</inp2:m_DefineElement>

	<inp2:sc_SaveWarning name="grid_save_warning"/>
	<inp2:sc_ErrorWarning name="form_error_warning"/>

	<div id="scroll_container" mode="minimal">
	<table class="edit-form">
	<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
	<inp2:m_RenderElement name="inp_edit_options" prefix="s" field="CostType" title="!la_fld_CostType!"/>
	<inp2:m_RenderElement name="inp_edit_radio" prefix="s" field="ZeroIfEmpty" title="!la_fld_EmptyCellsAre!" size="20"/>
	- <inp2:m_RenderElement name="precision_field" prefix="s" title="!la_Precision!"/>
	+
	+ <inp2:m_RenderElement design="form_row" prefix="s" field="PrecisionBeforeSep" title="la_Precision">
	+ <td class="control-cell">
	+ <select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="PrecisionBeforeSep"/>" id="<inp2:{$prefix}_InputName field="PrecisionBeforeSep"/>">
	+ <inp2:m_if check="m_ParamEquals" name="use_phrases" value="1" >
	+ <inp2:{$prefix}_PredefinedOptions field="PrecisionBeforeSep" block="inp_option_phrase" selected="selected"/>
	+ <inp2:m_else/>
	+ <inp2:{$prefix}_PredefinedOptions field="PrecisionBeforeSep" block="inp_option_item" selected="selected"/>
	+ </inp2:m_if>
	+ </select> , <select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="PrecisionAfterSep"/>" id="<inp2:{$prefix}_InputName field="PrecisionAfterSep"/>">
	+ <inp2:m_if check="m_ParamEquals" name="use_phrases" value="1" >
	+ <inp2:{$prefix}_PredefinedOptions field="PrecisionAfterSep" block="inp_option_phrase" selected="selected"/>
	+ <inp2:m_else/>
	+ <inp2:{$prefix}_PredefinedOptions field="PrecisionAfterSep" block="inp_option_item" selected="selected"/>
	+ </inp2:m_if>
	+ </select>
	+ </td>
	+ </inp2:m_RenderElement>
	+
	<inp2:m_RenderElement name="inp_edit_filler"/>
	</table>
	</div>

	<table class="edit-form">
	<inp2:m_RenderElement name="subsection" title="!la_section_ShippingCosts!"/>
	</table>

	<div id="cost_container" style="overflow: auto;">
	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder" style="border-top:none">
	<inp2:s_ShowCostsTable/>
	</table>
	</div>

	<input type="hidden" name="z_propagate_id" id="z_propagate_id" value="">
	<input type="hidden" name="br_propagate_id" id="br_propagate_id" value="">

	<script type="text/javascript">
	function propagate_values(prefix,id)
	{
	document.getElementById(prefix + '_propagate_id').value = id;
	submit_event('sc', 'OnPropagate');
	}

	document.getElementById('<inp2:s_InputName field="CostType"/>').onchange = saveShipping;
	document.getElementById('<inp2:s_InputName field="PrecisionBeforeSep"/>').onchange = saveShipping;
	document.getElementById('<inp2:s_InputName field="PrecisionAfterSep"/>').onchange = saveShipping;

	function saveShipping()
	{
	submit_event('s', 'OnPreSave');
	}

	$(document).ready(
	function() {
	maximizeElement('#cost_container');


	}
	);
	</script>

	<inp2:m_include t="incs/footer"/>
	\ No newline at end of file
	Index: branches/5.1.x/admin_templates/affiliate_plans/affiliate_plans_edit.tpl
	===================================================================
	--- branches/5.1.x/admin_templates/affiliate_plans/affiliate_plans_edit.tpl (revision 13922)
	+++ branches/5.1.x/admin_templates/affiliate_plans/affiliate_plans_edit.tpl (revision 13923)
	@@ -1,107 +1,103 @@
	<inp2:m_include t="incs/header"/>
	<inp2:m_RenderElement name="combined_header" prefix="ap" section="in-commerce:affiliate_plans" title_preset="affiliate_plans_edit" tab_preset="Default"/>

	<!-- ToolBar -->
	<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
	<tbody>
	<tr>
	<td>
	<script type="text/javascript">
	a_toolbar = new ToolBar();
	a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
	submit_event('ap','<inp2:ap_SaveEvent/>');
	}
	) );
	a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
	submit_event('ap','OnCancelEdit');
	}
	) );

	a_toolbar.AddButton( new ToolBarSeparator('sep1') );

	a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
	go_to_id('ap', '<inp2:ap_PrevId/>');
	}
	) );
	a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
	go_to_id('ap', '<inp2:ap_NextId/>');
	}
	) );

	a_toolbar.AddButton( new ToolBarSeparator('sep2') );

	a_toolbar.Render();

	<inp2:m_if check="ap_IsSingle" >
	a_toolbar.HideButton('prev');
	a_toolbar.HideButton('next');
	a_toolbar.HideButton('sep1');
	a_toolbar.HideButton('sep2');
	<inp2:m_else/>
	<inp2:m_if check="ap_IsLast" >
	a_toolbar.DisableButton('next');
	</inp2:m_if>
	<inp2:m_if check="ap_IsFirst" >
	a_toolbar.DisableButton('prev');
	</inp2:m_if>
	</inp2:m_if>
	</script>
	</td>
	</tr>
	</tbody>
	</table>

	<inp2:ap_SaveWarning name="grid_save_warning"/>
	<inp2:ap_ErrorWarning name="form_error_warning"/>

	<div id="scroll_container">
	<table class="edit-form">
	<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
	<inp2:m_RenderElement name="inp_label" prefix="ap" field="AffiliatePlanId" title="!la_fld_Id!"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="ap" field="Name" title="!la_fld_Name!" size="40"/>
	<inp2:m_RenderElement name="inp_edit_radio" prefix="ap" field="PlanType" title="!la_fld_PlanType!"/>
	<inp2:m_RenderElement name="inp_edit_options" prefix="ap" field="ResetInterval" title="!la_fld_Period!"/>
	<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ap" field="IsPrimary" title="!la_fld_Primary!" onchange="check_status()" />
	<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ap" field="Enabled" title="!la_fld_Enabled!" onchange="check_primary()"/>

	- <inp2:m_if check="ap_FieldVisible" field="MinPaymentAmount">
	- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
	- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="ap" field="MinPaymentAmount" title="la_fld_MinimumPaymentAmount" />
	- <td class="control-cell">
	- <input type="text" name="<inp2:ap_InputName field='MinPaymentAmount' />" id="<inp2:ap_InputName field='MinPaymentAmount' />" value="<inp2:ap_Field name='MinPaymentAmount' />" tabindex="<inp2:m_get param='tab_index'/>" size="8">
	- <span class="small">(<inp2:curr_PrimaryCurrencyISO />)</span>
	- </td>
	- <inp2:m_RenderElement name="inp_edit_error" prefix="ap" field="MinPaymentAmount"/>
	- </tr>
	- </inp2:m_if>
	+ <inp2:m_RenderElement design="form_row" prefix="ap" field="MinPaymentAmount" title="la_fld_MinimumPaymentAmount">
	+ <td class="control-cell">
	+ <input type="text" name="<inp2:ap_InputName field='MinPaymentAmount' />" id="<inp2:ap_InputName field='MinPaymentAmount' />" value="<inp2:ap_Field name='MinPaymentAmount' />" tabindex="<inp2:m_get param='tab_index'/>" size="8">
	+ <span class="small">(<inp2:curr_PrimaryCurrencyISO />)</span>
	+ </td>
	+ </inp2:m_RenderElement>
	<inp2:m_RenderElement name="inp_edit_filler"/>
	</table>
	</div>

	<script type="text/javascript">
	if(document.getElementById('_cb_<inp2:ap_InputName field="IsPrimary"/>').checked)
	{
	document.getElementById('_cb_<inp2:ap_InputName field="IsPrimary"/>').disabled = true;
	document.getElementById('_cb_<inp2:ap_InputName field="Enabled"/>').disabled = true;
	}

	function check_status()
	{
	if(document.getElementById('_cb_<inp2:ap_InputName field="IsPrimary"/>').checked)
	{
	document.getElementById('_cb_<inp2:ap_InputName field="Enabled"/>').checked = true;
	document.getElementById('<inp2:ap_InputName field="Enabled"/>').value = 1;
	}
	}

	function check_primary()
	{
	if(!document.getElementById('_cb_<inp2:ap_InputName field="Enabled"/>').checked)
	{
	document.getElementById('_cb_<inp2:ap_InputName field="IsPrimary"/>').checked = false;
	document.getElementById('<inp2:ap_InputName field="IsPrimary"/>').value = 0;
	}
	}
	</script>

	<inp2:m_include t="incs/footer"/>
	\ No newline at end of file
	Index: branches/5.1.x/admin_templates/orders/export/export.tpl
	===================================================================
	--- branches/5.1.x/admin_templates/orders/export/export.tpl (revision 13922)
	+++ branches/5.1.x/admin_templates/orders/export/export.tpl (revision 13923)
	@@ -1,174 +1,171 @@
	<inp2:adm_SetPopupSize width="780" height="670"/>

	<inp2:m_include t="incs/header"/>
	<inp2:m_RenderElement name="combined_header" prefix="ord.export" section="in-commerce:orders" title_preset="orders_export"/>

	<!-- ToolBar -->
	<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
	<tbody>
	<tr>
	<td>
	<script type="text/javascript">
	a_toolbar = new ToolBar();
	a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {

	document.getElementById('hidden_export_columns').value = select_to_string('<inp2:ord.export_InputName field="ExportColumns"/>');
	submit_event('ord.export', 'OnExportBegin');

	}
	) );
	a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
	submit_event('ord.export', 'OnGoBack');
	}
	) );

	a_toolbar.Render();
	</script>
	</td>
	</tr>
	</tbody>
	</table>

	<inp2:ord.export_SaveWarning name="grid_save_warning"/>
	<inp2:ord.export_ErrorWarning name="form_error_warning"/>

	<div id="scroll_container">
	<table class="edit-form">
	<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
	<inp2:m_RenderElement name="inp_edit_radio" prefix="ord.export" field="ExportFormat" title="la_fld_ExportFormat" use_phrases="0"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="ord.export" field="FieldsSeparatedBy" title="la_fld_FieldsSeparatedBy" size="2" maxlength="1"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="ord.export" field="FieldsEnclosedBy" title="la_fld_FieldsEnclosedBy" size="2" maxlength="1"/>
	<inp2:m_RenderElement name="inp_edit_radio" prefix="ord.export" field="LineEndings" title="la_fld_LineEndings" use_phrases="0"/>
	<inp2:m_RenderElement name="inp_edit_radio" prefix="ord.export" field="LineEndingsInside" title="la_fld_LineEndingsInside" use_phrases="0"/>

	<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ord.export" field="IncludeFieldTitles" title="la_fld_IncludeFieldTitles"/>

	- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
	- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord.export" field="ExportPresets" title="la_fld_ExportPresets"/>
	+ <inp2:m_RenderElement design="form_row" prefix="ord.export" field="ExportPresets" title="la_fld_ExportPresets">
	<td class="control-cell">
	<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:ord.export_InputName field="ExportPresets"/>" id="<inp2:ord.export_InputName field="ExportPresets"/>" onchange="update_fields(this.value)">
	<inp2:ord.export_PredefinedOptions field="ExportPresets" block="inp_option_item" selected="selected"/>
	</select>

	<input class="button" type="button" value="<inp2:m_Phrase label="la_Text_Delete"/>" onclick="delete_preset()">
	</td>
	- </tr>
	+ </inp2:m_RenderElement>

	- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
	- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord.export" field="ExportColumns" title="la_fld_ExportColumns"/>
	+ <inp2:m_RenderElement design="form_row" prefix="ord.export" field="ExportColumns" title="la_fld_ExportColumns">
	<td class="control-cell">
	<table cellpadding="0" cellspacing="0" border="0">
	<tr>
	<td>
	<input type="button" value="<inp2:m_phrase name="la_btn_Up"/>" onclick="move_options_up('<inp2:ord.export_InputName field="ExportColumns"/>', 1)" class="button">
	<input type="button" value="<inp2:m_phrase name="la_btn_Down"/>" onclick="move_options_down('<inp2:ord.export_InputName field="ExportColumns"/>', 1)" class="button"><br />
	<img src="img/s.gif" width="1" height="5" alt=""><br />
	</td>
	<td><img src="img/s.gif" width="45" height="1" alt=""><br></td>
	<td><inp2:m_phrase name="la_fld_AvailableColumns"/>:</td>
	</tr>
	<tr>
	<td>
	<select multiple id="<inp2:ord.export_InputName field="ExportColumns"/>" size="15" style="width: 225px;">
	<inp2:ord.export_PredefinedOptions field="ExportColumns" block="inp_option_item" selected="selected"/>
	</select>
	<input type="hidden" id="hidden_export_columns" name="<inp2:ord.export_InputName field="ExportColumns"/>" value="<inp2:ord.export_Field field="ExportColumns"/>" />
	</td>
	<td align="center">
	<input type="button" value=" «« " onclick="move_selected('<inp2:ord.export_InputName field="AvailableColumns"/>', '<inp2:ord.export_InputName field="ExportColumns"/>')" class="button"><br>
	<img src="img/s.gif" width="1" height="4" alt=""><br>
	<input type="button" value=" »» " onclick="move_selected('<inp2:ord.export_InputName field="ExportColumns"/>', '<inp2:ord.export_InputName field="AvailableColumns"/>'); select_sort('<inp2:ord.export_InputName field="AvailableColumns"/>');" class="button">
	</td>
	<td>
	<select multiple id="<inp2:ord.export_InputName field="AvailableColumns"/>" size="15" style="width: 225px;">
	<inp2:ord.export_PredefinedOptions field="AvailableColumns" block="inp_option_item" selected="selected"/>
	</select>
	</td>
	</tr>
	</table>
	</td>
	- <inp2:m_RenderElement name="inp_edit_error" prefix="ord.export" field="ExportColumns"/>
	- </tr>
	+ </inp2:m_RenderElement>

	<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ord.export" field="ExportSavePreset" title="la_fld_ExportSavePreset" size="2" maxlength="1" onclick="update_preset_field(this.checked)"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="ord.export" field="ExportPresetName" title="la_fld_ExportPresetName" size="20" />

	<inp2:m_RenderElement name="inp_edit_box" prefix="ord.export" field="ExportFilename" title="la_fld_ExportFilename" size="20" />
	<inp2:m_RenderElement name="inp_edit_filler"/>
	</table>
	</div>

	<script type="text/javascript" src="incs/ajax.js"></script>
	<script type="text/javascript">
	var delete_busy = false;

	function delete_preset()
	{
	if (!confirm('<inp2:m_Phrase label="la_ConfirmDeleteExportPreset" js_escape="1"/>')) return;
	var $kf = document.getElementById('kernel_form');
	tmp = $kf.elements['events[ord.export]'].value;
	$kf.elements['events[ord.export]'].value = 'OnDeleteExportPreset';
	Request.method = 'POST';
	Request.params = Request.serializeForm($kf);
	$kf.elements['events[ord.export]'].value = tmp;
	Request.makeRequest('<inp2:m_t ajax="1" ord.export_event="OnDeleteExportPreset" js_escape="1" no_amp="1"/>', delete_busy, '', function() {
	presets = document.getElementById('<inp2:ord.export_InputName field="ExportPresets"/>');
	-
	+
	for (i=0; i< presets.options.length; i++) {
	if (presets.options[i].selected) {
	presets.options.remove[i];
	}
	}
	presets.options[0].selected = true;
	}, function() {alert('error')} );
	}

	function update_preset_field(status)
	{
	if (status) {
	presets = document.getElementById('<inp2:ord.export_InputName field="ExportPresets"/>');
	if ( presets.value != '' ) {
	for (i=0; i< presets.options.length; i++) {
	if (presets.options[i].selected) {
	preset_name = presets.options[i].text
	}
	}
	document.getElementById('<inp2:ord.export_InputName field="ExportPresetName"/>').value = preset_name;
	}
	}
	document.getElementById('<inp2:ord.export_InputName field="ExportPresetName"/>').disabled = !status;
	}

	function update_fields(preset)
	{
	$export = select_to_string(document.getElementById('<inp2:ord.export_InputName field="ExportColumns"/>'));
	if ($export != '') {
	string_to_selected($export, document.getElementById('<inp2:ord.export_InputName field="ExportColumns"/>'));
	move_selected('<inp2:ord.export_InputName field="ExportColumns"/>', '<inp2:ord.export_InputName field="AvailableColumns"/>');
	}

	av = document.getElementById('<inp2:ord.export_InputName field="AvailableColumns"/>');
	fields = preset.split('\|');

	for (var i=0; i<fields.length; i++) {
	fld = fields[i];
	var $cur = null;
	for (var $i = 0; $i < av.length; $i++)
	{
	cur = av.options[$i];
	if (cur.value == fld) {
	av.options[$i].selected = true;
	move_selected('<inp2:ord.export_InputName field="AvailableColumns"/>', '<inp2:ord.export_InputName field="ExportColumns"/>');
	}
	else {
	av.options[$i].selected = false;
	}
	}
	}
	}

	update_preset_field(document.getElementById('<inp2:ord.export_InputName field="ExportPresetName"/>').checked)

	</script>

	<inp2:m_include t="incs/footer"/>
	\ No newline at end of file
	Index: branches/5.1.x/admin_templates/orders/orders_edit.tpl
	===================================================================
	--- branches/5.1.x/admin_templates/orders/orders_edit.tpl (revision 13922)
	+++ branches/5.1.x/admin_templates/orders/orders_edit.tpl (revision 13923)
	@@ -1,137 +1,129 @@
	<inp2:adm_SetPopupSize width="820" height="570"/>

	<inp2:m_include t="incs/header"/>
	<inp2:m_RenderElement name="combined_header" prefix="ord" section="in-commerce:orders" title_preset="orders_edit_general" tab_preset="Default"/>

	<!-- ToolBar -->
	<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
	<tbody>
	<tr>
	<td>
	<script type="text/javascript">
	a_toolbar = new ToolBar();
	a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
	submit_event('ord','<inp2:ord_SaveEvent/>');
	}
	) );
	a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
	submit_event('ord','OnCancelEdit');
	}
	) );

	a_toolbar.AddButton( new ToolBarSeparator('sep1') );

	a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
	go_to_id('ord', '<inp2:ord_PrevId/>');
	}
	) );
	a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
	go_to_id('ord', '<inp2:ord_NextId/>');
	}
	) );

	// a_toolbar.AddButton( new ToolBarSeparator('sep2') );

	a_toolbar.Render();

	<inp2:m_if check="ord_IsSingle" >
	a_toolbar.HideButton('prev');
	a_toolbar.HideButton('next');
	a_toolbar.HideButton('sep1');
	// a_toolbar.HideButton('sep2');
	<inp2:m_else/>
	<inp2:m_if check="ord_IsLast" >
	a_toolbar.DisableButton('next');
	</inp2:m_if>
	<inp2:m_if check="ord_IsFirst" >
	a_toolbar.DisableButton('prev');
	</inp2:m_if>
	</inp2:m_if>
	</script>
	</td>
	</tr>
	</tbody>
	</table>

	<inp2:m_RenderElement name="inp_edit_hidden" prefix="ord" field="Status" db="db"/>

	<inp2:ord_SaveWarning name="grid_save_warning"/>
	<inp2:ord_ErrorWarning name="form_error_warning"/>

	<div id="scroll_container">
	<table class="edit-form">
	<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>

	<inp2:m_RenderElement name="inp_id_label" prefix="ord" field="OrderId" title="!la_fld_OrderId!"/>

	<inp2:m_if check="ord_OrderEditable">
	- <inp2:m_if check="ord_FieldVisible" field="Number">
	- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
	- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord" field="Number" title="!la_fld_OrderNumber!"/>
	- <td class="control-cell">
	- <input type="text" name="<inp2:ord_InputName field='Number'/>" id="<inp2:ord_InputName field='Number'/>" value="<inp2:ord_Field field='Number' db='db'/>" tabindex="<inp2:m_get param='tab_index'/>" size="6" maxlength="6" class="text">
	- -<inp2:m_inc param="tab_index" by="1"/>
	- <input type="text" name="<inp2:ord_InputName field='SubNumber'/>" id="<inp2:ord_InputName field='SubNumber' db='db'/>" value="<inp2:ord_Field field='SubNumber'/>" tabindex="<inp2:m_get param='tab_index'/>" size="2" maxlength="3" class="text">
	- </td>
	- <inp2:m_RenderElement name="inp_edit_error" prefix="ord" field="OrderNumber"/>
	- </tr>
	- </inp2:m_if>
	+ <inp2:m_RenderElement design="form_row" prefix="ord" field="OrderNumber" title="la_fld_OrderNumber">
	+ <td class="control-cell">
	+ <input type="text" name="<inp2:ord_InputName field='Number'/>" id="<inp2:ord_InputName field='Number'/>" value="<inp2:ord_Field field='Number' db='db'/>" tabindex="<inp2:m_get param='tab_index'/>" size="6" maxlength="6" class="text">
	+ -<inp2:m_inc param="tab_index" by="1"/>
	+ <input type="text" name="<inp2:ord_InputName field='SubNumber'/>" id="<inp2:ord_InputName field='SubNumber' db='db'/>" value="<inp2:ord_Field field='SubNumber'/>" tabindex="<inp2:m_get param='tab_index'/>" size="2" maxlength="3" class="text">
	+ </td>
	+ </inp2:m_RenderElement>

	<inp2:m_if check="m_IsDebugMode" >
	<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="Status" title="!la_fld_Status!"/>
	<inp2:m_else/>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="Status" title="!la_fld_Status!"/>
	</inp2:m_if>

	<inp2:m_RenderElement name="inp_edit_date_time" prefix="ord" field="OrderDate" title="!la_fld_Date!"/>

	<inp2:m_RenderElement name="inp_edit_user" prefix="ord" field="PortalUserId" title="!la_fld_Username!" size="15"/>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="OrderIP" title="!la_fld_OrderIP!"/>
	<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ord" field="OnHold" title="la_fld_OnHold"/>

	<inp2:m_RenderElement name="subsection" title="!la_section_Affiliate!"/>
	<inp2:m_if check="ord_FieldEquals" field="AffiliateId" value="0">
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateId" title="!la_fld_AffiliateUser!" as_label="1"/>
	<inp2:m_else/>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateId" title="!la_fld_AffiliateUser!"/>
	</inp2:m_if>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateCommission" title="!la_fld_AffiliateCommission!" currency="selected"/>

	<inp2:m_RenderElement name="subsection" title="!la_section_Comments!"/>
	<inp2:m_RenderElement name="inp_edit_textarea" prefix="ord" field="UserComment" title="!la_fld_UserComment!" control_options="{min_height: 100}" rows="10" cols="40"/>
	<inp2:m_RenderElement name="inp_edit_textarea" prefix="ord" field="AdminComment" title="!la_fld_AdminComment!" control_options="{min_height: 100}" rows="10" cols="40"/>
	<inp2:m_else/>
	- <inp2:m_if check="ord_FieldVisible" field="Number">
	- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
	- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord" field="Number" title="!la_fld_OrderNumber!"/>
	- <td class="control-cell">
	- <inp2:ord_Field field="OrderNumber"/>
	- </td>
	- <inp2:m_RenderElement name="inp_edit_error" prefix="ord" field="OrderNumber"/>
	- </tr>
	- </inp2:m_if>
	+ <inp2:m_RenderElement design="form_row" prefix="ord" field="OrderNumber" title="la_fld_OrderNumber">
	+ <td class="control-cell">
	+ <inp2:ord_Field field="OrderNumber"/>
	+ </td>
	+ </inp2:m_RenderElement>

	<inp2:m_RenderElement name="inp_label" prefix="ord" field="Status" title="!la_fld_Status!"/>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="OrderDate" title="!la_fld_Date!"/>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="PortalUserId" title="!la_fld_Username!" size="15"/>

	<inp2:m_RenderElement name="inp_label" prefix="ord" field="OrderIP" title="!la_fld_OrderIP!"/>
	<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ord" field="OnHold" title="la_fld_OnHold"/>

	<inp2:m_RenderElement name="subsection" title="!la_section_Affiliate!"/>
	<inp2:m_if check="ord_FieldEquals" field="AffiliateId" value="0">
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateId" title="!la_fld_AffiliateUser!" as_label="1"/>
	<inp2:m_else/>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateId" title="!la_fld_AffiliateUser!"/>
	</inp2:m_if>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateCommission" title="!la_fld_AffiliateCommission!" currency="selected"/>

	<inp2:m_RenderElement name="subsection" title="!la_section_Comments!"/>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="UserComment" title="!la_fld_UserComment!" control_options="{min_height: 100}" rows="10" cols="40"/>
	<inp2:m_RenderElement name="inp_edit_textarea" prefix="ord" field="AdminComment" title="!la_fld_AdminComment!" control_options="{min_height: 100}" rows="10" cols="40"/>
	</inp2:m_if>
	<inp2:m_RenderElement name="inp_edit_filler"/>
	</table>
	</div>

	<inp2:m_include t="incs/footer"/>
	\ No newline at end of file
	Index: branches/5.1.x/admin_templates/orders/orders_edit_billing.tpl
	===================================================================
	--- branches/5.1.x/admin_templates/orders/orders_edit_billing.tpl (revision 13922)
	+++ branches/5.1.x/admin_templates/orders/orders_edit_billing.tpl (revision 13923)
	@@ -1,228 +1,218 @@
	<inp2:adm_SetPopupSize width="820" height="570"/>

	<inp2:m_include t="incs/header"/>
	<inp2:m_RenderElement name="combined_header" prefix="ord" section="in-commerce:orders" title_preset="orders_edit_billing" tab_preset="Default"/>

	<!-- ToolBar -->
	<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
	<tbody>
	<tr>
	<td>
	<script type="text/javascript">
	a_toolbar = new ToolBar();
	a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
	submit_event('ord','<inp2:ord_SaveEvent/>');
	}
	) );
	a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
	submit_event('ord','OnCancelEdit');
	}
	) );

	a_toolbar.AddButton( new ToolBarSeparator('sep1') );

	a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
	go_to_id('ord', '<inp2:ord_PrevId/>');
	}
	) );
	a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
	go_to_id('ord', '<inp2:ord_NextId/>');
	}
	) );

	<inp2:m_if check="ord_OrderEditable">
	a_toolbar.AddButton( new ToolBarSeparator('sep2') );

	a_toolbar.AddButton( new ToolBarButton('reset_to_user', '<inp2:m_phrase label="la_ToolTip_ResetToUser" escape="1"/>', function() {
	submit_event('ord','OnResetToUser');
	}
	) );

	a_toolbar.AddButton( new ToolBarButton('in-commerce:reset_to_shipping', '<inp2:m_phrase label="la_ToolTip_ResetToShipping" escape="1"/>', function() {
	submit_event('ord','OnResetToShipping');
	}
	) );
	</inp2:m_if>

	a_toolbar.Render();

	<inp2:m_if check="ord_IsSingle" >
	a_toolbar.HideButton('prev');
	a_toolbar.HideButton('next');
	a_toolbar.HideButton('sep1');
	a_toolbar.HideButton('sep2');
	<inp2:m_else/>
	<inp2:m_if check="ord_IsLast" >
	a_toolbar.DisableButton('next');
	</inp2:m_if>
	<inp2:m_if check="ord_IsFirst" >
	a_toolbar.DisableButton('prev');
	</inp2:m_if>
	</inp2:m_if>
	</script>
	</td>
	</tr>
	</tbody>
	</table>

	<script type="text/javascript">
	function OpenGWResults(field) {
	openSelector('ord', '<inp2:m_Link template="in-commerce/orders/gw_results" pass="m,ord"/>&field=' + field, '', '500x400');
	}
	</script>

	<inp2:m_DefineElement name="inp_gwresults" is_last="" as_label="" currency="" is_last="">
	- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
	- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
	+ <inp2:m_RenderElement design="form_row" pass_params="1">
	<td class="control-cell">
	<inp2:m_if check="m_Param" name="display_field"><inp2:m_Param name="display_field"/>: <inp2:Field name="$field" format="$display_field"/></inp2:m_if>
	<a href="javascript:OpenGWResults('<inp2:m_param name="field"/>')"><inp2:m_Phrase label="la_Details"/></a>
	</td>
	- <inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
	- </tr>
	+ </inp2:m_RenderElement>
	</inp2:m_DefineElement>

	<inp2:m_RenderElement name="inp_edit_hidden" prefix="ord" field="Status" db="db"/>

	<inp2:ord_SaveWarning name="grid_save_warning"/>
	<inp2:ord_ErrorWarning name="form_error_warning"/>

	<div id="scroll_container">
	<table class="edit-form">
	<inp2:m_RenderElement name="subsection" title="!la_section_OrderBilling!"/>
	<inp2:m_if check="ord_OrderEditable">
	<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingTo" title="!la_fld_BillingTo!" size="40"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingCompany" title="!la_fld_BillingCompany!" size="40"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingPhone" title="!la_fld_BillingPhone!" size="20"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingFax" title="!la_fld_BillingFax!" size="20"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingEmail" title="!la_fld_BillingEmail!" size="20"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingAddress1" title="!la_fld_BillingAddress1!" size="40"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingAddress2" title="!la_fld_BillingAddress2!" size="40"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingCity" title="!la_fld_BillingCity!" size="20"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingState" title="!la_fld_BillingState!" size="20"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingZip" title="!la_fld_BillingZip!" size="10"/>
	<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="BillingCountry" title="!la_fld_BillingCountry!" size="20"/>
	<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="PaymentType" title="!la_fld_PaymentType!" onchange="submit_event('ord','OnPreSave');"/>

	<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ord" field="IsRecurringBilling" title="!la_fld_IsRecurringBilling!"/>
	<inp2:m_RenderElement name="inp_edit_date_time" prefix="ord" field="NextCharge" title="!la_fld_NextCharge!"/>

	<!--<inp2:m_RenderElement name="inp_gwresults" prefix="ord" display_field="score" field="VerificationResult" title="!la_fld_VerificationResult!" />-->

	<inp2:m_if check="ord_UsingCreditCard">
	<inp2:m_RenderElement name="subsection" title="!la_section_CreditCard!"/>
	<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="PaymentCardType" title="!la_fld_PaymentCardType!"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentAccount" title="!la_fld_CreditCardNumber!" size="20"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentNameOnCard" title="!la_fld_PaymentNameOnCard!" size="20"/>

	- <inp2:m_if check="ord_FieldVisible" field="PaymentCCExpDate">
	- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
	- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord" field="PaymentCCExpDate" title="!la_fld_PaymentCCExpDate!"/>
	- <td class="control-cell">
	- <input type="text" size="3" maxlength="2" name="<inp2:ord_InputName field="PaymentCCExpMonth"/>" id="<inp2:ord_InputName field="PaymentCCExpMonth"/>" value="<inp2:ord_Field field="PaymentCCExpMonth"/>">
	- /
	- <input type="text" size="3" maxlength="2" name="<inp2:ord_InputName field="PaymentCCExpYear"/>" id="<inp2:ord_InputName field="PaymentCCExpYear"/>" value="<inp2:ord_Field field="PaymentCCExpYear"/>">
	- </td>
	- <inp2:m_RenderElement name="inp_edit_error" prefix="ord" field="PaymentCCExpDate"/>
	- </tr>
	- </inp2:m_if>
	+ <inp2:m_RenderElement design="form_row" prefix="ord" field="PaymentCCExpDate" title="la_fld_PaymentCCExpDate">
	+ <td class="control-cell">
	+ <input type="text" size="3" maxlength="2" name="<inp2:ord_InputName field="PaymentCCExpMonth"/>" id="<inp2:ord_InputName field="PaymentCCExpMonth"/>" value="<inp2:ord_Field field="PaymentCCExpMonth"/>">
	+ /
	+ <input type="text" size="3" maxlength="2" name="<inp2:ord_InputName field="PaymentCCExpYear"/>" id="<inp2:ord_InputName field="PaymentCCExpYear"/>" value="<inp2:ord_Field field="PaymentCCExpYear"/>">
	+ </td>
	+ </inp2:m_RenderElement>

	<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentCVV2" title="!la_fld_PaymentCVV2!" size="5" maxlength="5"/>
	<inp2:m_RenderElement name="inp_edit_date_time" prefix="ord" field="PaymentExpires" title="!la_fld_PaymentExpires!" size="16"/>
	<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ord" field="ChargeOnNextApprove" title="!la_fld_ChargeOnNextApprove!"/>
	<inp2:m_else/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentAccount" title="!la_fld_PaymentAccount!" size="20"/>
	<inp2:m_RenderElement name="inp_edit_date_time" prefix="ord" field="PaymentExpires" title="!la_fld_PaymentDate!" size="16"/>
	</inp2:m_if>

	<inp2:m_if check="ord_Field" name="GWResult1" db="db">
	<inp2:m_RenderElement name="inp_gwresults" prefix="ord" field="GWResult1" title="!la_fld_AuthorizationResult!" />
	</inp2:m_if>

	<inp2:m_if check="ord_Field" name="GWResult2" db="db">
	<inp2:m_RenderElement name="inp_gwresults" prefix="ord" field="GWResult2" title="!la_fld_CaptureResult!" />
	</inp2:m_if>
	<inp2:m_else/>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingTo" title="!la_fld_BillingTo!" size="40"/>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingCompany" title="!la_fld_BillingCompany!" size="40"/>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingPhone" title="!la_fld_BillingPhone!" size="20"/>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingFax" title="!la_fld_BillingFax!" size="20"/>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingEmail" title="!la_fld_BillingEmail!" size="20"/>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingAddress1" title="!la_fld_BillingAddress1!" size="40"/>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingAddress2" title="!la_fld_BillingAddress2!" size="40"/>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingCity" title="!la_fld_BillingCity!" size="20"/>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingState" title="!la_fld_BillingState!" size="20"/>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingZip" title="!la_fld_BillingZip!" size="10"/>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="BillingCountry" title="!la_fld_BillingCountry!" size="20"/>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentType" title="!la_fld_PaymentType!"/>

	<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ord" field="IsRecurringBilling" title="!la_fld_IsRecurringBilling!"/>
	<inp2:m_RenderElement name="inp_edit_date_time" prefix="ord" field="NextCharge" title="!la_fld_NextCharge!"/>

	<inp2:m_RenderElement name="inp_gwresults" prefix="ord" field="VerificationResult" display_field="score" title="!la_fld_VerificationResult!" />

	<inp2:m_if check="ord_UsingCreditCard">
	<inp2:m_RenderElement name="subsection" title="!la_section_CreditCard!"/>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentCardType" title="!la_fld_PaymentCardType!"/>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentAccount" title="!la_fld_CreditCardNumber!"/>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentNameOnCard" title="!la_fld_PaymentNameOnCard!"/>

	- <inp2:m_if check="ord_FieldVisible" field="PaymentCCExpDate">
	- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
	- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord" field="PaymentCCExpDate" title="!la_fld_PaymentCCExpDate!"/>
	- <td class="control-cell">
	- <inp2:ord_Field field="PaymentCCExpMonth"/> / <inp2:ord_Field field="PaymentCCExpYear"/>
	- </td>
	- <inp2:m_RenderElement name="inp_edit_error" prefix="ord" field="PaymentCCExpDate"/>
	- </tr>
	- </inp2:m_if>
	+ <inp2:m_RenderElement design="form_row" prefix="ord" field="PaymentCCExpDate" title="la_fld_PaymentCCExpDate">
	+ <td class="control-cell">
	+ <inp2:ord_Field field="PaymentCCExpMonth"/> / <inp2:ord_Field field="PaymentCCExpYear"/>
	+ </td>
	+ </inp2:m_RenderElement>

	<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentCVV2" title="!la_fld_PaymentCVV2!"/>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentExpires" title="!la_fld_PaymentExpires!"/>
	<inp2:m_else/>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentAccount" title="!la_fld_PaymentAccount!"/>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentExpires" title="!la_fld_PaymentDate!"/>
	</inp2:m_if>

	<inp2:m_if check="ord_Field" name="GWResult1" db="db">
	<inp2:m_RenderElement name="inp_gwresults" prefix="ord" field="GWResult1" title="!la_fld_AuthorizationResult!" />
	</inp2:m_if>

	<inp2:m_if check="ord_Field" name="GWResult2" db="db">
	<inp2:m_RenderElement name="inp_gwresults" prefix="ord" field="GWResult2" title="!la_fld_CaptureResult!" />
	</inp2:m_if>
	</inp2:m_if>

	<inp2:m_if check="ord_Field" name="CouponId">
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="CouponCode" title="!la_fld_CouponCode!" />
	</inp2:m_if>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="DiscountTotal" title="!la_fld_TotalSavings!" />
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="ReturnTotal" title="!la_fld_TotalReturns!" />

	<inp2:m_if check="ord_FieldEquals" name="VAT" value="0.00">
	<inp2:m_else />
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="AmountWithoutVAT" title="!la_fld_SubTotal!" />
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="VAT" title="!la_fld_VAT!" />
	</inp2:m_if>

	<inp2:m_if check="ord_Field" name="GiftCertificateId">
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="GiftCertificateCode" title="!la_fld_Gift_Certificate_Number!" />
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="GiftCertificateDiscount" title="!la_fld_Gift_Certificate_Amount_Applied!" />
	</inp2:m_if>


	<inp2:m_RenderElement name="inp_label" prefix="ord" field="TotalAmount" title="!la_fld_TotalAmount!" />
	<inp2:m_if check="ord_HasOriginalAmount" >
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="OriginalAmount" title="!la_fld_OriginalAmount!" />
	</inp2:m_if>
	<inp2:m_RenderElement name="inp_edit_filler"/>
	</table>
	</div>

	<input type="hidden" name="to_tab" value="Billing">
	<input type="hidden" name="check_billing_address" value="true" />
	<inp2:m_if check="ord_UsingCreditCard">
	<input type="hidden" name="check_credit_card" value="true" />
	</inp2:m_if>

	<inp2:m_include t="incs/footer"/>
	\ No newline at end of file
	Index: branches/5.1.x/admin_templates/orders/orders_edit_shipping.tpl
	===================================================================
	--- branches/5.1.x/admin_templates/orders/orders_edit_shipping.tpl (revision 13922)
	+++ branches/5.1.x/admin_templates/orders/orders_edit_shipping.tpl (revision 13923)
	@@ -1,245 +1,244 @@
	<inp2:adm_SetPopupSize width="820" height="570"/>

	<inp2:m_include t="incs/header"/>
	<inp2:m_RenderElement name="combined_header" prefix="ord" section="in-commerce:orders" title_preset="orders_edit_shipping" tab_preset="Default"/>

	<!-- ToolBar -->
	<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
	<tbody>
	<tr>
	<td>
	<script type="text/javascript">
	a_toolbar = new ToolBar();
	a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
	submit_event('ord','<inp2:ord_SaveEvent/>');
	}
	) );
	a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
	submit_event('ord','OnCancelEdit');
	}
	) );

	a_toolbar.AddButton( new ToolBarSeparator('sep1') );

	a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
	go_to_id('ord', '<inp2:ord_PrevId/>');
	}
	) );
	a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
	go_to_id('ord', '<inp2:ord_NextId/>');
	}
	) );
	<inp2:m_if check="ord_OrderEditable">
	a_toolbar.AddButton( new ToolBarSeparator('sep2') );


	a_toolbar.AddButton( new ToolBarButton('reset_to_user', '<inp2:m_phrase label="la_ToolTip_ResetToUser" escape="1"/>', function() {
	submit_event('ord','OnResetToUser');
	}
	) );

	a_toolbar.AddButton( new ToolBarButton('in-commerce:reset_to_billing', '<inp2:m_phrase label="la_ToolTip_ResetToBilling" escape="1"/>', function() {
	submit_event('ord','OnResetToBilling');
	}
	) );
	</inp2:m_if>

	a_toolbar.Render();

	<inp2:m_if check="ord_IsSingle" >
	a_toolbar.HideButton('prev');
	a_toolbar.HideButton('next');
	a_toolbar.HideButton('sep1');
	a_toolbar.HideButton('sep2');
	<inp2:m_else/>
	<inp2:m_if check="ord_IsLast" >
	a_toolbar.DisableButton('next');
	</inp2:m_if>
	<inp2:m_if check="ord_IsFirst" >
	a_toolbar.DisableButton('prev');
	</inp2:m_if>
	</inp2:m_if>
	</script>
	</td>
	</tr>
	</tbody>
	</table>

	<inp2:m_RenderElement name="inp_edit_hidden" prefix="ord" field="Status" db="db"/>

	<inp2:ord_SaveWarning name="grid_save_warning"/>

	<inp2:m_if check="m_Recall" name="usps_errors">
	<inp2:m_RenderElement design="form_message" pass_params="1">
	<inp2:m_Recall name="usps_errors" />
	<inp2:m_RemoveVar name="usps_errors"/>
	</inp2:m_RenderElement>
	</inp2:m_if>

	<inp2:ord_ErrorWarning name="form_error_warning"/>

	<div id="scroll_container">
	<table class="edit-form">
	<inp2:m_RenderElement name="subsection" title="!la_section_OrderShipping!"/>

	<inp2:m_if check="ord_OrderEditable">

	<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingTo" title="!la_fld_ShippingTo!" size="40"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCompany" title="!la_fld_ShippingCompany!" size="40"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingPhone" title="!la_fld_ShippingPhone!" size="20"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingFax" title="!la_fld_ShippingFax!" size="20"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingEmail" title="!la_fld_ShippingEmail!" size="20"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingAddress1" title="!la_fld_ShippingAddress1!" size="40"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingAddress2" title="!la_fld_ShippingAddress2!" size="40"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCity" title="!la_fld_ShippingCity!" size="20"/>

	<script type="text/javascript">
	function update_address()
	{
	submit_event('ord','OnQuietPreSave');
	}
	</script>

	<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingState" title="!la_fld_ShippingState!" size="20" />
	<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingZip" title="!la_fld_ShippingZip!" size="10"/>
	<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="ShippingCountry" title="!la_fld_ShippingCountry!" size="20" />

	<inp2:m_DefineElement name="order_option">
	<input onclick="submit_event('ord','OnQuietPreSave');" class="simple" type="radio" <inp2:m_param name="checked"/> name="<inp2:InputName field="$field"/>" id="<inp2:InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>"><label for="<inp2:InputName field="$field"/>_<inp2:m_param name="key"/>"><inp2:m_phrase label="$option"/></label> <br>
	</inp2:m_DefineElement>

	<!-- <inp2:m_RenderElement name="inp_edit_radio" prefix="ord" field="ShippingOption" title="!la_fld_ShippingOption!" size="20" /> -->

	<inp2:m_DefineElement name="order_shipping_type">
	<option <inp2:m_param name="selected"/> value="<inp2:m_param name="ShippingId"/>"><inp2:m_param name="ShippingName"/> (<inp2:m_param name="TotalCost"/>)
	</inp2:m_DefineElement>

	<inp2:m_DefineElement name="order_shipment">
	<tr class="<inp2:m_odd_even var="shipping_odd_even" odd="table-color1" even="table-color2"/>">
	<td style="border-right: 1px solid black"><inp2:m_param name="shipment"/></td>
	<td>
	<select style="width:230px;" name="<inp2:m_param name="field_name"/>" id="<inp2:m_param name="field_name"/>">
	<inp2:ord_PrintShippingTypes block="order_shipping_type" currency="selected"/>
	</select>
	</td>
	</tr>
	</inp2:m_DefineElement>

	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
	<inp2:m_inc param="tab_index" by="1"/>
	<td class="label-cell">
	<inp2:m_Phrase label="la_fld_ShippingOptions"/>:
	</td>
	<td class="control-mid"> </td>
	<td class="control-cell">
	<inp2:ord_PredefinedOptions field="ShippingOption" block="order_option" selected="checked" />
	</td>
	</tr>

	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
	<inp2:m_inc param="tab_index" by="1"/>
	<td class="label-cell">
	<inp2:m_Phrase label="la_fld_ShippingType"/>:
	</td>
	<td class="control-mid"> </td>
	<td class="control-cell">
	<table border="0" cellspacing="1" cellpadding="3" width="100%" style="border: 1px solid black; border-collapse: collapse">
	<tr class="subsectiontitle" style="border-bottom: 1px solid black">
	<td width="25%" style="border-right: 1px solid black"><b><inp2:m_Phrase label="lu_ship_Shipment" /></b></td>
	<td width="45%" style="border-right: 1px solid black"><b><inp2:m_Phrase label="lu_ship_ShippingType" /></b></td>
	</tr>

	<inp2:ord_PrintShippings block="order_shipment" currency="selected"/>
	</table>
	</td>
	</tr>

	<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCost" title="!la_fld_ShippingCost!" size="10"/>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="InsuranceFee" title="!la_fld_InsuranceFee!" size="10" currency="selected"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCustomerAccount" title="!la_fld_ShippingCustomerAccount!" size="30"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingTracking" title="!la_fld_ShippingTracking!" size="30"/>
	<inp2:m_RenderElement name="inp_edit_date_time" prefix="ord" field="ShippingDate" title="!la_fld_ShippingDate!" size="16"/>

	<inp2:m_else/>

	<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingTo" title="!la_fld_ShippingTo!" size="40"/>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingCompany" title="!la_fld_ShippingCompany!" size="40"/>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingPhone" title="!la_fld_ShippingPhone!" size="20"/>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingFax" title="!la_fld_ShippingFax!" size="20"/>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingEmail" title="!la_fld_ShippingEmail!" size="20"/>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingAddress1" title="!la_fld_ShippingAddress1!" size="40"/>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingAddress2" title="!la_fld_ShippingAddress2!" size="40"/>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingCity" title="!la_fld_ShippingCity!" size="20"/>

	<script type="text/javascript">
	function update_address()
	{
	submit_event('ord','OnQuietPreSave');
	}
	</script>

	<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingCountry" title="!la_fld_ShippingCountry!" size="20"/>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingState" title="!la_fld_ShippingState!" size="20"/>

	<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingZip" title="!la_fld_ShippingZip!" size="10"/>

	<inp2:m_DefineElement name="order_option_label">
	<inp2:m_param name="key"/> <inp2:m_phrase label="$option"/>
	</inp2:m_DefineElement>

	<!--inp2:m_ParseBlock name="inp_edit_radio" prefix="ord" field="ShippingOption" title="!la_fld_ShippingOption!" size="20"/-->

	<inp2:m_DefineElement name="order_shipping_type">
	<option <inp2:m_param name="selected"/> value="<inp2:m_param name="ShippingId"/>"><inp2:m_param name="ShippingName"/> (<inp2:m_param name="TotalCost"/>)
	</inp2:m_DefineElement>

	<inp2:m_DefineElement name="order_shipment_label">
	<inp2:m_param name="shipment"/> - <inp2:ord_PrintShippingTypes block="order_shipping_type" currency="selected" selected_only="1"/>
	</inp2:m_DefineElement>

	<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingOption" title="!la_fld_ShippingOptions!" size="10"/>

	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
	<inp2:m_inc param="tab_index" by="1"/>
	<td class="label-cell">
	<inp2:m_Phrase label="la_fld_ShippingType"/>:
	</td>
	<td class="control-mid"> </td>
	<td class="control-cell">
	<inp2:ord_PrintShippings block="order_shipment_label" currency="selected"/>
	</td>
	</tr>

	<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingCost" title="!la_fld_ShippingCost!" size="10" format="$ %.2f"/>

	<inp2:m_RenderElement name="inp_label" prefix="ord" field="InsuranceFee" title="!la_fld_InsuranceFee!" size="10" format="$ %.2f"/>
	<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingCustomerAccount" title="!la_fld_ShippingCustomerAccount!" size="30"/>

	<inp2:m_DefineElement name="inp_shipping_label" is_last="" as_label="" currency="" is_last="">
	- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
	- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
	+ <inp2:m_RenderElement design="form_row" pass_params="1">
	<td valign="top" class="control-cell">
	<inp2:{$prefix}_Field field="$field" as_label="$as_label" currency="$currency"/>

	<inp2:m_if check="{$prefix}_USPSLabelFound" field="$field">
	<a href="#" onClick="javascript:submit_event('<inp2:m_Param name="prefix"/>', 'OnDownloadLabel'); return false;"><inp2:m_Phrase label="la_ViewLabel"/></a>
	</inp2:m_if>
	</td>
	- </tr>
	+ </inp2:m_RenderElement>
	</inp2:m_DefineElement>

	<inp2:m_RenderElement name="inp_shipping_label" prefix="ord" field="ShippingTracking" title="!la_fld_ShippingTracking!" size="30"/>


	<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingDate" title="!la_fld_ShippingDate!" size="16"/>

	</inp2:m_if>

	<inp2:m_RenderElement name="inp_edit_filler"/>
	</table>
	</div>

	<input type="hidden" name="to_tab" value="Shipping">
	<input type="hidden" name="check_shipping_address" value="true" />

	<inp2:m_include t="incs/footer"/>
	\ No newline at end of file
	Index: branches/5.1.x/admin_templates/currencies/currencies_edit.tpl
	===================================================================
	--- branches/5.1.x/admin_templates/currencies/currencies_edit.tpl (revision 13922)
	+++ branches/5.1.x/admin_templates/currencies/currencies_edit.tpl (revision 13923)
	@@ -1,122 +1,114 @@
	<inp2:m_include t="incs/header"/>
	<inp2:m_RenderElement name="combined_header" prefix="curr" section="in-commerce:currencies" title_preset="currencies_edit"/>

	<!-- ToolBar -->
	<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
	<tbody>
	<tr>
	<td>
	<script type="text/javascript">
	a_toolbar = new ToolBar();
	a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
	submit_event('curr','<inp2:curr_SaveEvent/>');
	}
	) );
	a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
	submit_event('curr','OnCancelEdit');
	}
	) );

	a_toolbar.AddButton( new ToolBarSeparator('sep1') );

	a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
	go_to_id('curr', '<inp2:curr_PrevId/>');
	}
	) );
	a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
	go_to_id('curr', '<inp2:curr_NextId/>');
	}
	) );

	a_toolbar.Render();

	<inp2:m_if check="curr_IsSingle" >
	a_toolbar.HideButton('prev');
	a_toolbar.HideButton('next');
	a_toolbar.HideButton('sep1');
	a_toolbar.HideButton('sep2');
	<inp2:m_else/>
	<inp2:m_if check="curr_IsLast" >
	a_toolbar.DisableButton('next');
	</inp2:m_if>
	<inp2:m_if check="curr_IsFirst" >
	a_toolbar.DisableButton('prev');
	</inp2:m_if>
	</inp2:m_if>

	</script>
	</td>
	</tr>
	</tbody>
	</table>

	<inp2:curr_SaveWarning name="grid_save_warning"/>
	<inp2:curr_ErrorWarning name="form_error_warning"/>

	<div id="scroll_container">
	<table class="edit-form">
	<inp2:m_RenderElement name="subsection" title="!la_section_Currency!"/>
	<inp2:m_RenderElement name="inp_label" prefix="curr" field="CurrencyId" title="!la_fld_Id!"/>
	<inp2:m_RenderElement name="inp_label" prefix="curr" field="ISO" title="!la_fld_ISOCode!"/>

	- <inp2:m_if check="curr_FieldVisible" field="RateToPrimary">
	- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
	- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="curr" field="RateToPrimary" title="!la_fld_RateToPrimary!" />
	- <td class="control-cell">
	- <input type="text" name="<inp2:curr_InputName field='RateToPrimary'/>" id="<inp2:curr_InputName field='RateToPrimary'/>" value="<inp2:curr_Field field='RateToPrimary'/>" size="10">
	- <input type="button" class="button" onclick="submit_event('curr', 'OnUpdateRate')" value="<inp2:m_phrase label='la_UpdateRate'/>">
	- <span class="small">1 <inp2:curr_Field field="ISO"/> = ? <inp2:curr_PrimaryCurrencyISO /></span>
	- </td>
	- <inp2:m_RenderElement name="inp_edit_error" prefix="curr" field="RateToPrimary"/>
	- </tr>
	- </inp2:m_if>
	-
	- <inp2:m_if check="curr_FieldVisible" field="Symbol">
	- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
	- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="curr" field="Symbol" title="!la_fld_CurrencySymbol!"/>
	- <td class="control-cell">
	- <input type="text" name="<inp2:curr_InputName field='Symbol'/>" id="<inp2:curr_InputName field='Symbol'/>" value="<inp2:curr_Field field='Symbol'/>" tabindex="<inp2:m_get param='tab_index'/>" size="10">
	- <span class="small"><inp2:m_phrase label="la_ISOUsedIfBlank" /></span>
	- <inp2:curr_Error field="Symbol"/>
	- </td>
	- <inp2:m_RenderElement name="inp_edit_error" prefix="curr" field="Symbol"/>
	- </tr>
	- </inp2:m_if>
	+ <inp2:m_RenderElement design="form_row" prefix="curr" field="RateToPrimary" title="la_fld_RateToPrimary">
	+ <td class="control-cell">
	+ <input type="text" name="<inp2:curr_InputName field='RateToPrimary'/>" id="<inp2:curr_InputName field='RateToPrimary'/>" value="<inp2:curr_Field field='RateToPrimary'/>" size="10">
	+ <input type="button" class="button" onclick="submit_event('curr', 'OnUpdateRate')" value="<inp2:m_phrase label='la_UpdateRate'/>">
	+ <span class="small">1 <inp2:curr_Field field="ISO"/> = ? <inp2:curr_PrimaryCurrencyISO /></span>
	+ </td>
	+ </inp2:m_RenderElement>
	+
	+ <inp2:m_RenderElement design="form_row" prefix="curr" field="Symbol" title="la_fld_CurrencySymbol">
	+ <td class="control-cell">
	+ <input type="text" name="<inp2:curr_InputName field='Symbol'/>" id="<inp2:curr_InputName field='Symbol'/>" value="<inp2:curr_Field field='Symbol'/>" tabindex="<inp2:m_get param='tab_index'/>" size="10">
	+ <span class="small"><inp2:m_phrase label="la_ISOUsedIfBlank" /></span>
	+ <inp2:curr_Error field="Symbol"/>
	+ </td>
	+ </inp2:m_RenderElement>

	<inp2:m_RenderElement name="inp_edit_radio" prefix="curr" field="SymbolPosition" title="!la_fld_CurrencySymbolPosition!"/>

	<inp2:m_RenderElement name="inp_edit_box" prefix="curr" field="Name" title="!la_fld_CurrencyName!" size="40"/>
	<inp2:m_RenderElement name="inp_edit_checkbox" prefix="curr" field="IsPrimary" title="!la_fld_Primary!" onchange="check_status()"/>
	<inp2:m_RenderElement name="inp_edit_checkbox" prefix="curr" field="Status" title="!la_fld_Enabled!" onchange="check_primary()"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="curr" field="Priority" title="!la_fld_Priority!" size="5"/>
	<inp2:m_RenderElement name="inp_edit_filler"/>
	</table>
	</div>

	<script type="text/javascript">
	if(document.getElementById('_cb_curr[<inp2:curr_field field="CurrencyId" />][IsPrimary]').checked)
	{
	document.getElementById('_cb_curr[<inp2:curr_field field="CurrencyId" />][IsPrimary]').disabled = true;
	document.getElementById('_cb_curr[<inp2:curr_field field="CurrencyId" />][Status]').disabled = true;
	}

	function check_status()
	{
	if(document.getElementById('_cb_curr[<inp2:curr_field field="CurrencyId" />][IsPrimary]').checked)
	{
	document.getElementById('_cb_curr[<inp2:curr_field field="CurrencyId" />][Status]').checked = true;
	document.getElementById('<inp2:curr_InputName field="Status"/>').value = 1;
	}
	}

	function check_primary()
	{
	if(!document.getElementById('_cb_curr[<inp2:curr_field field="CurrencyId" />][Status]').checked)
	{
	document.getElementById('_cb_curr[<inp2:curr_field field="CurrencyId" />][IsPrimary]').checked = false;
	document.getElementById('<inp2:curr_InputName field="IsPrimary"/>').value = 0;
	}
	}
	</script>

	<inp2:m_include t="incs/footer"/>
	\ No newline at end of file
	Index: branches/5.1.x/admin_templates/products/products_inventory.tpl
	===================================================================
	--- branches/5.1.x/admin_templates/products/products_inventory.tpl (revision 13922)
	+++ branches/5.1.x/admin_templates/products/products_inventory.tpl (revision 13923)
	@@ -1,201 +1,194 @@
	<inp2:adm_SetPopupSize width="1000" height="680"/>

	<inp2:m_include t="incs/header"/>

	<inp2:m_if check="p_Field" name="InventoryStatus" equals_to="2" db="db">
	<inp2:m_RenderElement name="combined_header" prefix="p" section="in-portal:browse" pagination="1" pagination_prefix="poc.grid" grid="Inventory" title_preset="inventory" tab_preset="Default"/>
	<inp2:m_else/>
	<inp2:m_RenderElement name="combined_header" prefix="p" section="in-portal:browse" title_preset="inventory" tab_preset="Default"/>
	</inp2:m_if>

	<!-- ToolBar -->
	<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
	<tbody>
	<tr>
	<td>
	<script type="text/javascript">
	a_toolbar = new ToolBar();

	function edit() {

	}

	a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
	submit_event('p','<inp2:p_SaveEvent/>');
	}
	) );
	a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
	submit_event('p','OnCancelEdit');
	}
	) );

	a_toolbar.AddButton( new ToolBarSeparator('sep1') );

	a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
	go_to_id('p', '<inp2:p_PrevId/>');
	}
	) );
	a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
	go_to_id('p', '<inp2:p_NextId/>');
	}
	) );

	<inp2:m_if check="p_Field" name="InventoryStatus" equals_to="2" db="db">
	a_toolbar.AddButton( new ToolBarSeparator('sep4') );

	a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
	show_viewmenu(a_toolbar,'view');
	}
	) );
	</inp2:m_if>

	a_toolbar.Render();

	<inp2:m_if check="p_IsSingle" >
	a_toolbar.HideButton('prev');
	a_toolbar.HideButton('next');
	a_toolbar.HideButton('sep1');
	<inp2:m_else/>
	<inp2:m_if check="p_IsLast" >
	a_toolbar.DisableButton('next');
	</inp2:m_if>
	<inp2:m_if check="p_IsFirst" >
	a_toolbar.DisableButton('prev');
	</inp2:m_if>
	</inp2:m_if>
	</script>
	</td>

	<inp2:m_if check="p_Field" name="InventoryStatus" equals_to="2" db="db">
	<inp2:m_RenderElement name="search_main_toolbar" prefix="poc.grid" grid="Inventory"/>
	</inp2:m_if>
	</tr>
	</tbody>
	</table>

	-<!-- block definitions: begin -->
	-<inp2:m_DefineElement name="inp_edit_inventory">
	- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
	- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
	- <td class="control-cell">
	- <input type="text" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" />
	- <input type="button" class="button" id="Add" value="<inp2:m_phrase label="la_btn_Add"/>" onclick="processButton('p', 'OnQtyAdd')">
	- <input type="button" class="button" id="Remove" value="<inp2:m_phrase label="la_btn_Remove"/>" onclick="processButton('p', 'OnQtyRemove')">
	- <input type="button" class="button" id="Order" value="<inp2:m_phrase label="la_btn_Order"/>" onclick="processButton('p', 'OnQtyOrder')">
	- <input type="button" class="button" id="ReceiveOrder" value="<inp2:m_phrase label="la_btn_ReceiveOrder"/>" onclick="processButton('p', 'OnQtyReceiveOrder')">
	- <input type="button" class="button" id="CancelOrder" value="<inp2:m_phrase label="la_btn_CancelOrder"/>" onclick="processButton('p', 'OnQtyCancelOrder')">
	- </td>
	- <inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
	- </tr>
	-</inp2:m_DefineElement>
	-<!-- block definitions: end -->
	-
	<inp2:m_ifnot check="p_Field" name="InventoryStatus" equals_to="2" db="db">
	<inp2:p_SaveWarning name="grid_save_warning"/>
	</inp2:m_ifnot>

	<inp2:p_ErrorWarning name="form_error_warning"/>

	<div id="scroll_container"<inp2:m_if check="p_Field" name="InventoryStatus" equals_to="2" db="db"> style="height: 142px;"</inp2:m_if>>
	<table class="edit-form"<inp2:m_if check="p_Field" name="InventoryStatus" equals_to="2" db="db"> style="border-bottom: 1px solid black;"</inp2:m_if>>
	<inp2:m_RenderElement name="subsection" title="!la_section_Product!"/>
	<inp2:m_RenderElement name="inp_edit_radio" prefix="p" field="InventoryStatus" title="la_fld_InventoryStatus" onchange="change_inventory_status()"/>

	<inp2:m_ifnot check="p_Field" name="InventoryStatus" db="db" equals_to="2">
	<!-- inventory by product / inventory disabled -->
	<inp2:m_RenderElement name="inp_label" prefix="p" field="QtyInStock" title="!la_fld_QtyInStock!"/>
	<inp2:m_RenderElement name="inp_label" prefix="p" field="QtyReserved" title="!la_fld_QtyReserved!"/>
	<inp2:m_RenderElement name="inp_label" prefix="p" field="QtyBackOrdered" title="!la_fld_QtyBackOrdered!"/>
	<inp2:m_RenderElement name="inp_label" prefix="p" field="QtyOnOrder" title="!la_fld_QtyOnOrder!"/>
	</inp2:m_ifnot>

	- <inp2:m_RenderElement name="inp_edit_inventory" prefix="p" field="Qty" title="!la_fld_Qty!" size="3"/>
	+ <inp2:m_RenderElement design="form_row" prefix="p" field="Qty" title="la_fld_Qty" size="3">
	+ <td class="control-cell">
	+ <input type="text" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" />
	+ <input type="button" class="button" id="Add" value="<inp2:m_phrase label="la_btn_Add"/>" onclick="processButton('p', 'OnQtyAdd')">
	+ <input type="button" class="button" id="Remove" value="<inp2:m_phrase label="la_btn_Remove"/>" onclick="processButton('p', 'OnQtyRemove')">
	+ <input type="button" class="button" id="Order" value="<inp2:m_phrase label="la_btn_Order"/>" onclick="processButton('p', 'OnQtyOrder')">
	+ <input type="button" class="button" id="ReceiveOrder" value="<inp2:m_phrase label="la_btn_ReceiveOrder"/>" onclick="processButton('p', 'OnQtyReceiveOrder')">
	+ <input type="button" class="button" id="CancelOrder" value="<inp2:m_phrase label="la_btn_CancelOrder"/>" onclick="processButton('p', 'OnQtyCancelOrder')">
	+ </td>
	+ </inp2:m_RenderElement>
	+
	<inp2:m_RenderElement name="inp_edit_textarea" prefix="p" field="InventoryComment" title="!la_fld_Comment!" cols="40" rows="3"/>
	<inp2:m_RenderElement name="inp_edit_filler"/>
	</table>
	</div>

	<inp2:m_if check="p_Field" name="InventoryStatus" equals_to="2" db="db">
	<!-- inventory by product options -->
	<inp2:m_DefineElement name="grid_combination_td">
	<inp2:Field field="$field" grid="$grid" no_special="1"/>
	<inp2:m_ifnot check="Field" field="Priority" equals_to="0"><span class="priority"><sup><inp2:Field field="Priority" /></sup></span></inp2:m_ifnot>
	</inp2:m_DefineElement>

	<inp2:m_RenderElement name="grid" main_special="" PrefixSpecial="poc.grid" IdField="CombinationId" grid="Inventory"/>
	</inp2:m_if>

	<script type="text/javascript">
	var $inventory_status = <inp2:p_Field name="InventoryStatus" db="db"/>;
	function getInventoryStatus() {
	var $i = 0;
	var $status_id = '<inp2:p_InputName field="InventoryStatus"/>';

	while ($i <= 2) {
	if (document.getElementById($status_id + '_' + $i).checked) {
	return $i;
	}
	$i++;
	}

	return 0;
	}

	function change_inventory_status()
	{
	var $new_inventory_status = getInventoryStatus();
	if (confirm('<inp2:m_phrase label="la_warning_ChangeInventoryStatus" />')) {
	$inventory_status = $new_inventory_status;
	affect_dependent_elements();
	go_to_tab('p', t);
	}
	else {
	var $status_id = '<inp2:p_InputName field="InventoryStatus"/>';
	document.getElementById($status_id + '_' + $new_inventory_status).checked = false;
	document.getElementById($status_id + '_' + $inventory_status).checked = true;
	document.getElementById($status_id + '_' + $inventory_status).focus();
	}
	}

	function iterateButtons($disabled, $class_name) {
	var $i = 0;
	var $buttons = Array('Add', 'Remove', 'Order', 'ReceiveOrder', 'CancelOrder');

	while ($i < $buttons.length) {
	document.getElementById($buttons[$i]).disabled = $disabled;
	document.getElementById($buttons[$i]).className = $class_name;
	$i++;
	}
	}

	function processButton($prefix, $event) {
	if ($inventory_status == 2) {
	if (Grids['poc.grid'].GetSelected().length == 0) {
	alert('<inp2:m_phrase name="la_warning_SelectOptionCombination" escape="1"/>')
	}
	else {
	// go next if option combination is selected
	submit_event($prefix, $event);
	}
	}
	else {
	// go next if not using option combination inventory
	submit_event($prefix, $event);
	}
	}

	function affect_dependent_elements()
	{
	var $inventory_disabled = document.getElementById('<inp2:p_InputName field="InventoryStatus"/>_0').checked;

	iterateButtons($inventory_disabled, $inventory_disabled ? 'button-disabled' : 'button');
	document.getElementById('<inp2:p_InputName field="Qty"/>').disabled = $inventory_disabled;
	document.getElementById('<inp2:p_InputName field="InventoryComment"/>').disabled = $inventory_disabled;

	document.getElementById('<inp2:p_InputName field="InventoryStatus"/>_2').disabled = <inp2:poc.grid_TotalRecords/> > 0 ? false : true;
	}

	affect_dependent_elements();
	</script>

	<inp2:m_include t="incs/footer"/>
	\ No newline at end of file
	Index: branches/5.1.x/admin_templates/import.tpl
	===================================================================
	--- branches/5.1.x/admin_templates/import.tpl (revision 13922)
	+++ branches/5.1.x/admin_templates/import.tpl (revision 13923)
	@@ -1,232 +1,223 @@
	<inp2:adm_SetPopupSize width="780" height="670"/>

	<inp2:m_include t="incs/header"/>
	<inp2:p.import_PresetFormFields/>
	<inp2:m_RenderElement name="combined_header" prefix="adm" section="in-portal:main_import" title_preset="import"/>

	<!-- ToolBar -->
	<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
	<tbody>
	<tr>
	<td>
	<script type="text/javascript">
	a_toolbar = new ToolBar();
	a_toolbar.AddButton( new ToolBarButton('import', '<inp2:m_phrase label="la_ToolTip_Import" escape="1"/>', function() {

	document.getElementById('export_columns').value = select_to_string('<inp2:p.import_InputName field="ExportColumns"/>');
	submit_event('p.import','OnExportBegin');

	}
	) );
	a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
	submit_event('p.import','OnGoBack');
	}
	) );

	a_toolbar.Render();

	function check_radio($id)
	{
	document.getElementById($id).checked = true;
	}

	// gets value of checked radio button
	function get_checked($field_name) {
	var $ret = false;
	var $fields = document.getElementsByName($field_name);

	for(var $i = 0; $i < $fields.length; $i++) {
	if ($fields[$i].checked) {
	$ret = $fields[$i].value;
	break;
	}
	}
	return $ret;
	}

	// enable/disable form fields based on other field values
	function reflectFormFields()
	{
	var $auto_fields = get_checked('<inp2:p.import_InputName field="FieldTitles"/>') == 1 ? true : false;

	if ($auto_fields) {
	document.getElementById('_cb_<inp2:p.import_InputName field="SkipFirstRow"/>').checked = true;
	}
	document.getElementById('_cb_<inp2:p.import_InputName field="SkipFirstRow"/>').onchange();
	document.getElementById('<inp2:p.import_InputName field="ExportColumns"/>').disabled = $auto_fields;
	document.getElementById('<inp2:p.import_InputName field="AvailableColumns"/>').disabled = $auto_fields;

	var $btn = null;
	var $btns = Array('up', 'down', 'left', 'right');
	var $i = 0;
	while ($i < $btns.length) {
	$btn = document.getElementById('btn_move_'+$btns[$i]);
	$btn.disabled = $auto_fields;
	$btn.className = $auto_fields ? 'button-disabled' : 'button';
	$i++;
	}
	}

	Application.setHook('p.import:OnBeforeOpenSelector',
	function() {
	document.getElementById('export_columns').value = select_to_string('<inp2:p.import_InputName field="ExportColumns"/>');
	}
	);

	$(document).ready(
	function() {
	$('#step_number').text(3);
	}
	);
	</script>
	</td>
	</tr>
	</tbody>
	</table>


	<inp2:p.import_SaveWarning name="grid_save_warning"/>
	<inp2:p.import_ErrorWarning name="form_error_warning"/>

	<div id="scroll_container">
	<table class="edit-form">
	<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
	-
	- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
	- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="p.import" field="ImportSource" title="la_fld_ImportFilename"/>
	+ <inp2:m_RenderElement design="form_row" prefix="p.import" field="ImportSource" title="la_fld_ImportFilename">
	<td class="control-cell">
	<table border="0">
	<tr>
	<td>
	<input type="radio" name="<inp2:p.import_InputName field="ImportSource"/>" id="<inp2:p.import_InputName field="ImportSource"/>_1"<inp2:m_if check="p.import_FieldEquals" field="ImportSource" value="1"> checked</inp2:m_if> value="1" />
	</td>
	<td>
	<label for="<inp2:p.import_InputName field="ImportSource"/>_1">upload</label>
	</td>
	<td>
	<input type="file" name="<inp2:p.import_InputName field="ImportFilename"/>" id="<inp2:p.import_InputName field="ImportFilename"/>" onclick="check_radio('<inp2:p.import_InputName field="ImportSource"/>_1');">
	</td>
	</tr>

	<tr>
	<td>
	<input type="radio" name="<inp2:p.import_InputName field="ImportSource"/>" id="<inp2:p.import_InputName field="ImportSource"/>_2"<inp2:m_if check="p.import_FieldEquals" field="ImportSource" value="2"> checked</inp2:m_if> value="2" />
	</td>
	<td>
	<label for="<inp2:p.import_InputName field="ImportSource"/>_2">select</label>
	</td>
	<td>
	<select name="<inp2:p.import_InputName field="ImportLocalFilename"/>" onclick="check_radio('<inp2:p.import_InputName field="ImportSource"/>_2');">
	<inp2:p.import_PredefinedOptions field="ImportLocalFilename" block="inp_option_item" selected="selected"/>
	</select>
	</td>
	</tr>

	</table>
	</td>
	- <inp2:m_RenderElement name="inp_edit_error" prefix="p.import" field="ImportSource"/>
	- </tr>
	+ </inp2:m_RenderElement>

	<inp2:m_RenderElement name="inp_edit_box" prefix="p.import" field="FieldsSeparatedBy" title="la_fld_FieldsSeparatedBy" size="2" maxlength="1"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="p.import" field="FieldsEnclosedBy" title="la_fld_FieldsEnclosedBy" size="2" maxlength="1"/>
	<inp2:m_RenderElement name="inp_edit_radio" prefix="p.import" field="LineEndings" title="la_fld_LineEndings" use_phrases="0"/>
	<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p.import" field="SkipFirstRow" title="la_fld_SkipFirstRow"/>
	<inp2:m_RenderElement name="inp_edit_radio" prefix="p.import" field="FieldTitles" title="la_fld_FieldTitles" onclick="reflectFormFields();"/>

	- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
	- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="p.import" field="ExportColumns" title="la_fld_ImportColumns"/>
	+ <inp2:m_RenderElement design="form_row" prefix="p.import" field="ExportColumns" title="la_fld_ImportColumns">
	<td class="control-cell">
	<table cellpadding="0" cellspacing="0" border="0">
	<tr>
	<td>
	<input type="button" value="<inp2:m_phrase name="la_btn_Up"/>" id="btn_move_up" onclick="move_options_up('<inp2:p.import_InputName field="ExportColumns"/>', 1)" class="button">
	<input type="button" value="<inp2:m_phrase name="la_btn_Down"/>" id="btn_move_down" onclick="move_options_down('<inp2:p.import_InputName field="ExportColumns"/>', 1)" class="button"><br />
	<img src="img/spacer.gif" width="1" height="5" alt=""><br />
	</td>
	<td><img src="img/spacer.gif" width="45" height="1" alt=""><br></td>
	<td><inp2:m_phrase name="la_fld_AvailableColumns"/>:</td>
	</tr>
	<tr>
	<td>
	<select multiple id="<inp2:p.import_InputName field="ExportColumns"/>" size="15" style="width: 225px;">
	<inp2:p.import_PredefinedOptions field="ExportColumns" block="inp_option_item" selected="selected"/>
	</select>
	<input type="hidden" id="export_columns" name="<inp2:p.import_InputName field="ExportColumns"/>" value="<inp2:p.import_Field field="ExportColumns"/>" />
	</td>
	<td align="center">
	<input type="button" value=" «« " id="btn_move_left" onclick="move_selected('<inp2:p.import_InputName field="AvailableColumns"/>', '<inp2:p.import_InputName field="ExportColumns"/>')" class="button"><br>
	<img src="img/spacer.gif" width="1" height="4" alt=""><br>
	<input type="button" value=" »» " id="btn_move_right" onclick="move_selected('<inp2:p.import_InputName field="ExportColumns"/>', '<inp2:p.import_InputName field="AvailableColumns"/>'); select_sort('<inp2:p.import_InputName field="AvailableColumns"/>');" class="button">
	</td>
	<td>
	<select multiple id="<inp2:p.import_InputName field="AvailableColumns"/>" size="15" style="width: 225px;">
	<inp2:p.import_PredefinedOptions field="AvailableColumns" block="inp_option_item" selected="selected"/>
	</select>
	</td>
	</tr>
	</table>
	</td>
	- <inp2:m_RenderElement name="inp_edit_error" prefix="p.import" field="ExportColumns"/>
	- </tr>
	+ </inp2:m_RenderElement>

	<!-- CATEGORY SELECTOR: BEGIN -->
	<inp2:m_DefineElement name="root_cat_caption">
	<inp2:m_Phrase name="la_rootcategory_name"/>
	</inp2:m_DefineElement>

	<inp2:m_DefineElement name="category_caption">
	<inp2:m_param name="separator"/><inp2:m_param name="cat_name"/>
	</inp2:m_DefineElement>

	- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
	- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="p.import" field="CategoryId" title="la_fld_ImportCategory"/>
	+ <inp2:m_RenderElement design="form_row" prefix="p.import" field="CategoryId" title="la_fld_ImportCategory">
	<td class="control-cell">
	<b><inp2:p.import_CategoryPath separator=" > " root_cat_render_as="root_cat_caption" render_as="category_caption" session_var="ImportCategory"/></b>
	<input type="hidden" name="<inp2:p.import_InputName field='CategoryId'/>" value="<inp2:p.import_Field field='CategoryId' db='db'/>" />
	<a href="javascript:openSelector('p.import', '<inp2:adm_SelectorLink prefix="p.import" selection_mode="single" tab_prefixes="none"/>', 'ImportCategory', null, 'OnSaveSettings');"><img src="img/icons/icon24_cat.gif" border="0" align="absmiddle" /></a>
	</td>
	- <td class="error"><inp2:p.import_Error field="CategoryId"/> </td>
	- </tr>
	+ </inp2:m_RenderElement>

	<!-- CATEGORY SELECTOR: END -->
	<inp2:m_RenderElement name="inp_edit_box" prefix="p.import" field="CategorySeparator" title="la_fld_CategorySeparator" size="2" maxlength="1"/>
	<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p.import" field="ReplaceDuplicates" title="la_fld_ReplaceDuplicates" />

	- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
	- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="p.import" field="CheckDuplicatesMethod" title="la_fld_CheckDuplicatesMethod"/>
	+ <inp2:m_RenderElement design="form_row" prefix="p.import" field="CheckDuplicatesMethod" title="la_fld_CheckDuplicatesMethod">
	<td class="control-cell">
	<table cellspacing="0" cellpadding="0">
	<tr>
	<td valign="top">
	<input type="radio"<inp2:m_if check="p.import_FieldEquals" field="CheckDuplicatesMethod" value="1"> checked</inp2:m_if> name="<inp2:p.import_InputName field="CheckDuplicatesMethod"/>" id="<inp2:p.import_InputName field="CheckDuplicatesMethod"/>_1" value="1" />
	</td>
	<td>
	<label for="<inp2:p.import_InputName field="CheckDuplicatesMethod"/>_1"><inp2:m_phrase name="la_IDField" />: PRODUCTID</label>
	</td>
	</tr>

	<tr>
	<td valign="top">
	<input type="radio"<inp2:m_if check="p.import_FieldEquals" field="CheckDuplicatesMethod" value="2"> checked</inp2:m_if> name="<inp2:p.import_InputName field="CheckDuplicatesMethod"/>" id="<inp2:p.import_InputName field="CheckDuplicatesMethod"/>_2" value="2" />
	</td>
	<td>
	<label for="<inp2:p.import_InputName field="CheckDuplicatesMethod"/>_2"><inp2:m_phrase name="la_OtherFields" />: </label>
	<inp2:p.import_PredefinedOptions prefix="p.import" field="DuplicateCheckFields" block="inp_checkbox_item" selected="checked"/>

	<inp2:m_RenderElement prefix="p.import" name="inp_edit_hidden" field="DuplicateCheckFields"/>
	</td>
	</tr>
	</table>
	</td>
	- <inp2:m_RenderElement name="inp_edit_error" prefix="p.import" field="CheckDuplicatesMethod"/>
	- </tr>
	+ </inp2:m_RenderElement>

	<inp2:m_RenderElement name="inp_edit_filler"/>
	</table>
	</div>

	<script language="javascript" type="text/javascript">
	reflectFormFields();
	</script>

	<inp2:m_include t="incs/footer"/>
	\ No newline at end of file
	Index: branches/5.1.x/admin_templates/discounts/coupon_edit.tpl
	===================================================================
	--- branches/5.1.x/admin_templates/discounts/coupon_edit.tpl (revision 13922)
	+++ branches/5.1.x/admin_templates/discounts/coupon_edit.tpl (revision 13923)
	@@ -1,124 +1,110 @@
	<inp2:adm_SetPopupSize width="870" height="600"/>

	<inp2:m_include t="incs/header"/>
	<inp2:m_RenderElement name="combined_header" prefix="coup" section="in-commerce:coupons" title_preset="coupons_edit" tab_preset="Default"/>

	<!-- ToolBar -->
	<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
	<tbody>
	<tr>
	<td>
	<script type="text/javascript">
	a_toolbar = new ToolBar();
	a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
	submit_event('coup','<inp2:coup_SaveEvent/>');
	}
	) );
	a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
	submit_event('coup','OnCancel');
	}
	) );

	a_toolbar.AddButton( new ToolBarSeparator('sep1') );

	a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
	go_to_id('coup', '<inp2:coup_PrevId/>');
	}
	) );
	a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
	go_to_id('coup', '<inp2:coup_NextId/>');
	}
	) );

	//a_toolbar.AddButton( new ToolBarSeparator('sep2') );

	a_toolbar.Render();

	<inp2:m_if check="coup_IsSingle" >
	a_toolbar.HideButton('prev');
	a_toolbar.HideButton('next');
	a_toolbar.HideButton('sep1');
	//a_toolbar.HideButton('sep2');
	<inp2:m_else/>
	<inp2:m_if check="coup_IsLast" >
	a_toolbar.DisableButton('next');
	</inp2:m_if>
	<inp2:m_if check="coup_IsFirst" >
	a_toolbar.DisableButton('prev');
	</inp2:m_if>
	</inp2:m_if>
	</script>
	</td>
	</tr>
	</tbody>
	</table>

	<script language="JavaScript">
	function Random(N) {
	return Math.floor(N * (Math.random() % 1));
	}

	function generateRandomCode(elementId){
	var j, S = "", d;
	for (j = 0; j < 10; j++) {
	d=Random(2);
	if (d==1)
	S += String.fromCharCode(65 + Random(26));
	else
	S += String(Random(9));
	}
	document.getElementById(elementId).value=S;
	}
	</script>

	-<inp2:m_DefineElement name="inp_edit_box_generate" is_last="0">
	- <inp2:m_if check="{$prefix}_FieldVisible" field="$field">
	- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
	- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
	- <td class="control-cell">
	- <input type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:m_param name='size'/>">
	- <input type="button" class="button" onClick="generateRandomCode('<inp2:{$prefix}_InputName field='$field'/>')" value="<inp2:m_Phrase label='la_GenerateCode' />" />
	- </td>
	- <inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
	- </tr>
	- </inp2:m_if>
	-</inp2:m_DefineElement>
	-
	-<inp2:m_DefineElement name="inp_edit_box_comment" is_last="0">
	- <inp2:m_if check="{$prefix}_FieldVisible" field="$field">
	- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
	- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
	- <td class="control-cell">
	- <input type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:m_param name='size'/>">
	- <inp2:m_Phrase label="la_comment_LeaveBlank" />
	- </td>
	- <inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
	- </tr>
	- </inp2:m_if>
	-</inp2:m_DefineElement>
	-
	<inp2:coup_SaveWarning name="grid_save_warning"/>
	<inp2:coup_ErrorWarning name="form_error_warning"/>

	<div id="scroll_container">
	<table class="edit-form">
	<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
	<inp2:m_RenderElement name="inp_label" prefix="coup" field="CouponId" title="!la_fld_Id!"/>
	<inp2:m_RenderElement name="inp_edit_radio" prefix="coup" field="Status" title="!la_fld_Status!"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="coup" field="Name" title="!la_fld_Name!" size="35"/>
	- <inp2:m_RenderElement name="inp_edit_box_generate" prefix="coup" field="Code" title="!la_fld_CouponCode!" size="35"/>
	+
	+ <inp2:m_RenderElement design="form_row" prefix="coup" field="Code" title="la_fld_CouponCode" size="35">
	+ <td class="control-cell">
	+ <input type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:m_param name='size'/>">
	+ <input type="button" class="button" onClick="generateRandomCode('<inp2:{$prefix}_InputName field='$field'/>')" value="<inp2:m_Phrase label='la_GenerateCode' />" />
	+ </td>
	+ </inp2:m_RenderElement>

	<inp2:m_RenderElement name="inp_edit_date_time" prefix="coup" field="Expiration" title="!la_fld_Expiration!" size="10"/>

	<inp2:m_RenderElement name="inp_edit_options" prefix="coup" field="Type" title="!la_fld_Type!"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="coup" field="Amount" title="!la_fld_Amount!" size="4"/>

	<inp2:m_RenderElement name="inp_label" prefix="coup" field="LastUsedBy" title="!la_fld_LastUsedBy!" size="15"/>
	<inp2:m_RenderElement name="inp_label" prefix="coup" field="LastUsedOn" title="!la_fld_LastUsedOn!" size="10"/>

	- <inp2:m_RenderElement name="inp_edit_box_comment" prefix="coup" field="NumberOfUses" title="!la_fld_NumberOfUses!" size="4"/>
	+ <inp2:m_RenderElement design="form_row" prefix="coup" field="NumberOfUses" title="la_fld_NumberOfUses" size="4">
	+ <td class="control-cell">
	+ <input type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:m_param name='size'/>">
	+ <inp2:m_Phrase label="la_comment_LeaveBlank" />
	+ </td>
	+ </inp2:m_RenderElement>
	+
	<inp2:m_RenderElement name="inp_edit_filler"/>
	</table>
	</div>

	<inp2:m_include t="incs/footer"/>
	\ No newline at end of file
	Index: branches/5.1.x/admin_templates/discounts/gift_certificate_edit.tpl
	===================================================================
	--- branches/5.1.x/admin_templates/discounts/gift_certificate_edit.tpl (revision 13922)
	+++ branches/5.1.x/admin_templates/discounts/gift_certificate_edit.tpl (revision 13923)
	@@ -1,171 +1,164 @@
	<inp2:adm_SetPopupSize width="780" height="640"/>

	<inp2:m_include t="incs/header"/>
	<inp2:m_RenderElement name="combined_header" prefix="gc" section="in-commerce:gift-certificates" title_preset="gift_certificates_edit"/>

	<!-- ToolBar -->
	<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
	<tbody>
	<tr>
	<td>
	<script type="text/javascript">
	a_toolbar = new ToolBar();
	a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
	submit_event('gc','<inp2:gc_SaveEvent/>');
	}
	) );


	a_toolbar.AddButton( new ToolBarButton('in-commerce:save_and_print', '<inp2:m_phrase label="la_ToolTip_SaveAndPrint" escape="1"/>', function() {
	set_hidden_field('print_certificate', 1);
	submit_event('gc','<inp2:gc_SaveEvent/>');
	}
	) );


	a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
	submit_event('gc','OnCancel');
	}
	) );

	a_toolbar.AddButton( new ToolBarSeparator('sep1') );

	a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
	go_to_id('gc', '<inp2:gc_PrevId/>');
	}
	) );
	a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
	go_to_id('gc', '<inp2:gc_NextId/>');
	}
	) );

	a_toolbar.Render();

	<inp2:m_if check="gc_IsSingle" >
	a_toolbar.HideButton('prev');
	a_toolbar.HideButton('next');
	a_toolbar.HideButton('sep1');
	<inp2:m_else/>
	<inp2:m_if check="gc_IsLast" >
	a_toolbar.DisableButton('next');
	</inp2:m_if>
	<inp2:m_if check="gc_IsFirst" >
	a_toolbar.DisableButton('prev');
	</inp2:m_if>
	</inp2:m_if>
	</script>
	</td>
	</tr>
	</tbody>
	</table>

	<script language="JavaScript">
	function Random(N) {
	return Math.floor(N * (Math.random() % 1));
	}

	function generateRandomCode(elementId){
	var j, S = "", d;
	for (j = 0; j < 10; j++) {
	d=Random(2);
	if (d==1)
	S += String.fromCharCode(65 + Random(26));
	else
	S += String(Random(9));
	}
	document.getElementById(elementId).value=S;
	}
	</script>

	-<inp2:m_DefineElement name="inp_edit_box_generate" class="" onblur="" maxlength="" is_last="0">
	- <inp2:m_if check="{$prefix}_FieldVisible" field="$field">
	- <tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
	- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
	- <td class="control-cell">
	- <input type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:m_param name='size'/>">
	- <input type="button" class="button" onClick="generateRandomCode('<inp2:{$prefix}_InputName field='$field'/>')" value="<inp2:m_Phrase label='la_GenerateCode' />" />
	- </td>
	- <inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
	- </tr>
	- </inp2:m_if>
	-</inp2:m_DefineElement>
	-
	<inp2:gc_SaveWarning name="grid_save_warning"/>
	<inp2:gc_ErrorWarning name="form_error_warning"/>

	<div id="scroll_container">
	<table class="edit-form">
	<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
	<inp2:m_RenderElement name="inp_id_label" prefix="gc" field="GiftCertificateId" title="la_fld_Id"/>

	<inp2:m_if check="gc_HasOrder">
	<inp2:m_RenderElement name="inp_label" prefix="gc" field="Purchaser" title="!la_fld_SenderName!" size="35"/>
	<inp2:m_RenderElement name="inp_label" prefix="gc" field="Recipient" title="!la_fld_RecipientName!" size="35"/>
	<inp2:m_RenderElement name="inp_label" prefix="gc" field="Message" title="!la_fld_MessageText!" cols="35" rows="7"/>
	<inp2:m_RenderElement name="inp_label" prefix="gc" field="Amount" title="!la_fld_Amount!" size="7"/>

	<inp2:m_RenderElement name="inp_label" prefix="gc" field="SendVia" title="!la_fld_DeliveryMethod!"/>
	<inp2:m_else/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="Purchaser" title="!la_fld_SenderName!" size="35"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="Recipient" title="!la_fld_RecipientName!" size="35"/>
	<inp2:m_RenderElement name="inp_edit_textarea" prefix="gc" field="Message" title="!la_fld_MessageText!" cols="35" rows="7"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="Amount" title="!la_fld_Amount!" size="7"/>

	<inp2:m_RenderElement name="inp_edit_radio" prefix="gc" field="SendVia" title="!la_fld_DeliveryMethod!"/>
	</inp2:m_if>

	<inp2:m_RenderElement name="subsection" title="!la_section_EmailDelivery!"/>
	<inp2:m_if check="gc_HasOrder">
	<inp2:m_RenderElement name="inp_label" prefix="gc" field="RecipientEmail" title="!la_fld_Email!" size="35"/>
	<inp2:m_else/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="RecipientEmail" title="!la_fld_Email!" size="35"/>
	</inp2:m_if>

	<inp2:m_RenderElement name="subsection" title="!la_section_PostalDelivery!"/>
	<inp2:m_if check="gc_HasOrder">
	<inp2:m_RenderElement name="inp_label" prefix="gc" field="RecipientFirstname" title="la_fld_FirstName" size="35"/>
	<inp2:m_RenderElement name="inp_label" prefix="gc" field="RecipientLastname" title="la_fld_LastName" size="35"/>
	<inp2:m_RenderElement name="inp_label" prefix="gc" field="RecipientAddress1" title="la_fld_AddressLine1"/>
	<inp2:m_RenderElement name="inp_label" prefix="gc" field="RecipientAddress2" title="la_fld_AddressLine2"/>
	<inp2:m_RenderElement name="inp_label" prefix="gc" field="RecipientCity" title="la_fld_City"/>
	<inp2:m_RenderElement name="inp_label" prefix="gc" field="RecipientZipcode" title="la_fld_Zip"/>
	<inp2:m_RenderElement name="inp_label" prefix="gc" field="RecipientState" title="la_fld_State"/>
	<inp2:m_RenderElement name="inp_label" prefix="gc" field="RecipientCountry" title="la_fld_Country"/>
	<inp2:m_RenderElement name="inp_label" prefix="gc" field="RecipientPhone" title="la_fld_Phone"/>
	<inp2:m_else/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="RecipientFirstname" title="la_fld_FirstName" size="35"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="RecipientLastname" title="la_fld_LastName" size="35"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="RecipientAddress1" title="la_fld_AddressLine1"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="RecipientAddress2" title="la_fld_AddressLine2"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="RecipientCity" title="la_fld_City"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="RecipientZipcode" title="la_fld_Zip"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="RecipientState" title="la_fld_State"/>
	<inp2:m_RenderElement name="inp_edit_options" prefix="gc" field="RecipientCountry" title="la_fld_Country" has_empty="1"/>
	<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="RecipientPhone" title="la_fld_Phone"/>
	</inp2:m_if>

	<inp2:m_RenderElement name="subsection" title="la_section_Properties"/>
	<inp2:m_RenderElement name="inp_edit_radio" prefix="gc" field="Status" title="!la_fld_Status!"/>

	<inp2:m_if check="gc_HasOrder">
	<inp2:m_RenderElement name="inp_label" prefix="gc" field="AddDate" title="la_fld_CreatedOn"/>
	<inp2:m_RenderElement name="inp_label" prefix="gc" field="Code" title="!la_fld_Code!" size="35"/>
	<inp2:m_else/>
	<inp2:m_RenderElement name="inp_edit_date_time" prefix="gc" field="AddDate" title="la_fld_CreatedOn"/>
	- <inp2:m_RenderElement name="inp_edit_box_generate" prefix="gc" field="Code" title="!la_fld_Code!" size="35"/>
	+
	+ <inp2:m_RenderElement design="form_row" prefix="gc" field="Code" title="la_fld_Code" size="35">
	+ <td class="control-cell">
	+ <input type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:m_param name='size'/>">
	+ <input type="button" class="button" onClick="generateRandomCode('<inp2:{$prefix}_InputName field='$field'/>')" value="<inp2:m_Phrase label='la_GenerateCode' />" />
	+ </td>
	+ </inp2:m_RenderElement>
	</inp2:m_if>

	<inp2:m_if check="gc_IsNewItem" inverse="inverse">
	<inp2:m_RenderElement name="inp_label" prefix="gc" field="Debit" title="!la_fld_RemainingAmount!" size="7"/>
	</inp2:m_if>

	<inp2:m_if check="gc_HasOrder">
	<inp2:m_RenderElement name="inp_label" prefix="gc" field="Expiration" title="!la_fld_Expiration!" size="10"/>
	<inp2:m_else/>
	<inp2:m_RenderElement name="inp_edit_date_time" prefix="gc" field="Expiration" title="!la_fld_Expiration!" size="10"/>
	</inp2:m_if>
	<inp2:m_RenderElement name="inp_edit_filler"/>
	</table>
	</div>

	<inp2:m_include t="incs/footer"/>
	\ No newline at end of file

in-commerceNo OneTemporaryActions

File Metadata

in-commerceView Options

Event Timeline

in-commerce
No OneTemporary
Actions

in-commerce
View Options