From cd14987bfd12e05541424e8e64ae88a84dbb5bbf Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 23 Nov 2011 11:49:03 +0530
Subject: [PATCH 1/3] [FIX] sale_layout : From view of sale.order.line is not
 good

lp bug: https://launchpad.net/bugs/893098 fixed

bzr revid: mdi@tinyerp.com-20111123061903-mydbuatehhl0rc7p
---
 addons/sale_layout/sale_layout_view.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/sale_layout/sale_layout_view.xml b/addons/sale_layout/sale_layout_view.xml
index 79adefa32f3..25c1c0fe590 100644
--- a/addons/sale_layout/sale_layout_view.xml
+++ b/addons/sale_layout/sale_layout_view.xml
@@ -18,10 +18,8 @@
                                 <notebook>
                                     <page string="Order Line">
                                     <group colspan="4" col="5">
-                                        <field name="layout_type" on_change="onchange_sale_order_line_view(layout_type)"/>
+                                    	<field colspan="3" name="layout_type" on_change="onchange_sale_order_line_view(layout_type)"/>
                                         <field name="sequence" groups="base.group_extended"/>
-                                    </group>
-                                    <group colspan="4" col="5">
                                         <field colspan="3"
                                             context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}"
                                             name="product_id"

From b1f511ba9b0be27e76956fcab28220dc5d9ddf04 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 23 Nov 2011 11:58:06 +0530
Subject: [PATCH 2/3] [FIX] sale_layout : From view of sale.order.line is not
 good

lp bug: https://launchpad.net/bugs/893098 fixed

bzr revid: mdi@tinyerp.com-20111123062806-39w2fffuiwrhor1h
---
 addons/sale_layout/sale_layout_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_layout/sale_layout_view.xml b/addons/sale_layout/sale_layout_view.xml
index 25c1c0fe590..62585e319d6 100644
--- a/addons/sale_layout/sale_layout_view.xml
+++ b/addons/sale_layout/sale_layout_view.xml
@@ -44,7 +44,7 @@
                                             attrs="{'invisible':[('layout_type','!=','article')],'required':[('layout_type','not in',['title','text','subtotal','line','break'])]}"/>
 
                                         <field groups="product.group_uos" name="product_uos_qty" on_change="uos_change(product_uos, product_uos_qty, product_id)"/>
-                                        <field groups="product.group_uos" name="product_uos"/>
+                                        <field groups="product.group_uos" name="product_uos" nolabel="1"/>
                                         <newline/>
 
                                         <field

From 9661a1566de322a147677fc00d8d42428acdc85a Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 23 Nov 2011 12:08:27 +0530
Subject: [PATCH 3/3] [Imp] sale_layout : Improve Indentation

bzr revid: mdi@tinyerp.com-20111123063827-a60zgnlxxier4cfi
---
 addons/sale_layout/sale_layout_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_layout/sale_layout_view.xml b/addons/sale_layout/sale_layout_view.xml
index 62585e319d6..27b8e4b4f96 100644
--- a/addons/sale_layout/sale_layout_view.xml
+++ b/addons/sale_layout/sale_layout_view.xml
@@ -18,7 +18,7 @@
                                 <notebook>
                                     <page string="Order Line">
                                     <group colspan="4" col="5">
-                                    	<field colspan="3" name="layout_type" on_change="onchange_sale_order_line_view(layout_type)"/>
+                                        <field colspan="3" name="layout_type" on_change="onchange_sale_order_line_view(layout_type)"/>
                                         <field name="sequence" groups="base.group_extended"/>
                                         <field colspan="3"
                                             context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}"