Index: branches/5.2.x/admin_templates/products/products_inventory.tpl
===================================================================
diff -u -N -r13845 -r14089
--- branches/5.2.x/admin_templates/products/products_inventory.tpl	(.../products_inventory.tpl)	(revision 13845)
+++ branches/5.2.x/admin_templates/products/products_inventory.tpl	(.../products_inventory.tpl)	(revision 14089)
@@ -73,23 +73,6 @@
 </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"/>" />&nbsp;
-			<input type="button" class="button" id="Add" value="<inp2:m_phrase label="la_btn_Add"/>" onclick="processButton('p', 'OnQtyAdd')">&nbsp;
-			<input type="button" class="button" id="Remove" value="<inp2:m_phrase label="la_btn_Remove"/>" onclick="processButton('p', 'OnQtyRemove')">&nbsp;
-			<input type="button" class="button" id="Order" value="<inp2:m_phrase label="la_btn_Order"/>" onclick="processButton('p', 'OnQtyOrder')">&nbsp;
-			<input type="button" class="button" id="ReceiveOrder" value="<inp2:m_phrase label="la_btn_ReceiveOrder"/>" onclick="processButton('p', 'OnQtyReceiveOrder')">&nbsp;
-			<input type="button" class="button" id="CancelOrder" value="<inp2:m_phrase label="la_btn_CancelOrder"/>" onclick="processButton('p', 'OnQtyCancelOrder')">&nbsp;
-		</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>
@@ -98,19 +81,29 @@
 
 <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="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_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 name="inp_edit_textarea" prefix="p" field="InventoryComment" title="!la_fld_Comment!" cols="40" rows="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"/>" />&nbsp;
+					<input type="button" class="button" id="Add" value="<inp2:m_phrase label="la_btn_Add"/>" onclick="processButton('p', 'OnQtyAdd')">&nbsp;
+					<input type="button" class="button" id="Remove" value="<inp2:m_phrase label="la_btn_Remove"/>" onclick="processButton('p', 'OnQtyRemove')">&nbsp;
+					<input type="button" class="button" id="Order" value="<inp2:m_phrase label="la_btn_Order"/>" onclick="processButton('p', 'OnQtyOrder')">&nbsp;
+					<input type="button" class="button" id="ReceiveOrder" value="<inp2:m_phrase label="la_btn_ReceiveOrder"/>" onclick="processButton('p', 'OnQtyReceiveOrder')">&nbsp;
+					<input type="button" class="button" id="CancelOrder" value="<inp2:m_phrase label="la_btn_CancelOrder"/>" onclick="processButton('p', 'OnQtyCancelOrder')">&nbsp;
+				</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>