From e379cdc01c7a8a49aab06792e3d26122150bda34 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Wed, 20 Jun 2012 15:36:14 +0530
Subject: [PATCH 1/9] [IMP]Purchase Order line : Changes in form view

bzr revid: hsa@tinyerp.com-20120620100614-6qcsz0zr86d1hfgy
---
 addons/purchase/purchase_view.xml | 35 ++++++++++---------------------
 1 file changed, 11 insertions(+), 24 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 72f50a78cf8..b268cb16a2e 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -394,38 +394,25 @@
             <field name="arch" type="xml">
                 <form string="Purchase Order Line" version="7.0">
                 	<sheet>
-	                    <label for="order_id" class="oe_edit_only"/>
-	                    <h1>
-	                        <field name="order_id" class="oe_inline"/>, 
-	                        <field name="date_order" class="oe_inline"/>
-	                    </h1>
-	                    <label for="partner_id" class="oe_edit_only"/>
-	                    <h2><field name="partner_id"/></h2>
-	
-	                    <group>
+	                    <group col="4" colspan="4">
 	                        <group>
-	                            <field name="name"/>
-	                            <field name="product_id" readonly="1"/>
-	                            <label for="product_qty"/>
-	                            <div>
-	                                <field name="product_qty" readonly="1" class="oe_inline"/>
-	                                <field name="product_uom" readonly="1" groups="product.group_uom" class="oe_inline"/>
-	                            </div>
-	                            <field name="price_unit"/>
+	                           <field name="product_id"/>
+	                           <field name="product_qty" readonly="1" class="oe_inline"/>
+	                           <field name="price_unit"/>
+	                           <field name="taxes_id" widget="many2many_tags"
+	                                domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>                         
 	                        </group>
 	                        <group>
-	                            <field name="date_planned" widget="date"  readonly="1"/>
-	                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-	                            <field name="account_analytic_id" colspan="4" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
-	                            <field name="taxes_id" widget="many2many_tags"
-	                                domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
-	                            <field name="invoiced"/>
+	                            <field name="name"/>
+ 	                            <field name="date_planned" widget="date"  readonly="1"/>
+ 	                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+ 	                            <field name="account_analytic_id" colspan="2" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
 	                        </group>
 	                    </group>
 	                    <separator string="Manual Invoices"/>
 	                    <field name="invoice_lines"/>
 	                    <separator string="Notes"/>
-	                    <field name="notes"/>
+	                    <field name="notes" placeholder="Add a note on the purchase line..."/>
 	                    <separator string="Stock Moves"/>
 	                    <field name="move_ids"/>
 	            	</sheet>

From 093289849dc3c36fbe7cb77eb19fdf830aa06d2f Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Wed, 20 Jun 2012 16:32:07 +0530
Subject: [PATCH 2/9] [IMP]Purchase Order : Create Child View

bzr revid: hsa@tinyerp.com-20120620110207-wbvn3uvcdc9w0vn7
---
 addons/purchase/purchase_view.xml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index b268cb16a2e..3ed423c5d03 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -164,8 +164,24 @@
                     <notebook>
                         <page string="Purchase Order">
                             <field name="order_line">
+                            	<form string="Purchase Order Lines" version="7.0">
+                            	<header>
+                                        <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
+                                </header>
+                                <group col="4" colspan="4">
+                                	<group>
+                                		<field name="name"/>
+                                		<field name="product_qty"/>
+                                    	<field name="price_unit"/>
+                                	</group>
+                                	<group>
+                                		<field name="product_uom" groups="product.group_uom"/>
+                                		<field name="date_planned"/>
+                                		<field name="price_subtotal"/>
+                                	</group>
+                                </group>
+                            	</form>
                                 <tree string="Purchase Order Lines">
-                                    <field name="date_planned"/>
                                     <field name="name"/>
                                     <field name="product_qty"/>
                                     <field name="product_uom" groups="product.group_uom"/>

From 23a01aef8170e22c6483d0d2622437a762bab6a0 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Wed, 20 Jun 2012 16:37:12 +0530
Subject: [PATCH 3/9] [IMP]Purchase Order : Create Child View

bzr revid: hsa@tinyerp.com-20120620110712-n6b8w4orfaulmg6z
---
 addons/purchase/purchase_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 3ed423c5d03..69904487c55 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -182,11 +182,12 @@
                                 </group>
                             	</form>
                                 <tree string="Purchase Order Lines">
+                                	<field name="date_planned"/>
                                     <field name="name"/>
                                     <field name="product_qty"/>
                                     <field name="product_uom" groups="product.group_uom"/>
                                     <field name="price_unit"/>
-                                    <field name="price_subtotal"/>
+                                    <field name="price_subtotal"/>  
                                 </tree>
                             </field>
                             <group class="oe_subtotal_footer" col="4">

From 1e12b6f77c81f625c1d378c2635d58f57b3e758c Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Wed, 20 Jun 2012 16:43:54 +0530
Subject: [PATCH 4/9] [IMP]Purchase Order : Create Child View

bzr revid: hsa@tinyerp.com-20120620111354-9liet880g7idfgzc
---
 addons/purchase/purchase_view.xml | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 69904487c55..7d9e9adf091 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -164,23 +164,7 @@
                     <notebook>
                         <page string="Purchase Order">
                             <field name="order_line">
-                            	<form string="Purchase Order Lines" version="7.0">
-                            	<header>
-                                        <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
-                                </header>
-                                <group col="4" colspan="4">
-                                	<group>
-                                		<field name="name"/>
-                                		<field name="product_qty"/>
-                                    	<field name="price_unit"/>
-                                	</group>
-                                	<group>
-                                		<field name="product_uom" groups="product.group_uom"/>
-                                		<field name="date_planned"/>
-                                		<field name="price_subtotal"/>
-                                	</group>
-                                </group>
-                            	</form>
+                            	
                                 <tree string="Purchase Order Lines">
                                 	<field name="date_planned"/>
                                     <field name="name"/>

From 10e84474cd27e6670ef5105135999bab810018a2 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Wed, 20 Jun 2012 16:44:30 +0530
Subject: [PATCH 5/9] [IMP]Purchase Order : Create Child View

bzr revid: hsa@tinyerp.com-20120620111430-ge5jqw9t4rkqyrqx
---
 addons/purchase/purchase_view.xml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 7d9e9adf091..69904487c55 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -164,7 +164,23 @@
                     <notebook>
                         <page string="Purchase Order">
                             <field name="order_line">
-                            	
+                            	<form string="Purchase Order Lines" version="7.0">
+                            	<header>
+                                        <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
+                                </header>
+                                <group col="4" colspan="4">
+                                	<group>
+                                		<field name="name"/>
+                                		<field name="product_qty"/>
+                                    	<field name="price_unit"/>
+                                	</group>
+                                	<group>
+                                		<field name="product_uom" groups="product.group_uom"/>
+                                		<field name="date_planned"/>
+                                		<field name="price_subtotal"/>
+                                	</group>
+                                </group>
+                            	</form>
                                 <tree string="Purchase Order Lines">
                                 	<field name="date_planned"/>
                                     <field name="name"/>

From 4e48547af665e105f0519cde0fc6e25483243ab5 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Wed, 20 Jun 2012 18:59:39 +0530
Subject: [PATCH 6/9] [IMP]Purchase Order : Create Child View

bzr revid: hsa@tinyerp.com-20120620132939-x4rt3h6f5ldv7ffu
---
 addons/purchase/purchase_view.xml | 62 +++++++++++++++++++------------
 1 file changed, 39 insertions(+), 23 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 69904487c55..8375ae0cbf4 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -170,14 +170,17 @@
                                 </header>
                                 <group col="4" colspan="4">
                                 	<group>
-                                		<field name="name"/>
+                                		<field name="product_id"/>
                                 		<field name="product_qty"/>
                                     	<field name="price_unit"/>
+                                    	<field name="taxes_id" widget="many2many_tags"
+												domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/> 
                                 	</group>
                                 	<group>
-                                		<field name="product_uom" groups="product.group_uom"/>
+                                		<field name="name"/>
                                 		<field name="date_planned"/>
-                                		<field name="price_subtotal"/>
+										<field name="account_analytic_id" colspan="2" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
+										<field name="company_id" groups="base.group_multi_company" widget="selection"/>
                                 	</group>
                                 </group>
                             	</form>
@@ -411,27 +414,40 @@
             <field name="arch" type="xml">
                 <form string="Purchase Order Line" version="7.0">
                 	<sheet>
-	                    <group col="4" colspan="4">
-	                        <group>
-	                           <field name="product_id"/>
-	                           <field name="product_qty" readonly="1" class="oe_inline"/>
-	                           <field name="price_unit"/>
-	                           <field name="taxes_id" widget="many2many_tags"
-	                                domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>                         
-	                        </group>
-	                        <group>
-	                            <field name="name"/>
- 	                            <field name="date_planned" widget="date"  readonly="1"/>
- 	                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
- 	                            <field name="account_analytic_id" colspan="2" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
-	                        </group>
-	                    </group>
+	                    <label for="order_id" class="oe_edit_only"/>
+						<h1>
+						<field name="order_id" class="oe_inline"/>,
+						<field name="date_order" class="oe_inline"/>
+						</h1>
+						<label for="partner_id" class="oe_edit_only"/>
+						<h2><field name="partner_id"/></h2>
+						
+						<group>
+	                    	<group>
+								<field name="name"/>
+								<field name="product_id" readonly="1"/>
+								<label for="product_qty"/>
+								<div>
+								<field name="product_qty" readonly="1" class="oe_inline"/>
+								<field name="product_uom" readonly="1" groups="product.group_uom" class="oe_inline"/>
+								</div>
+								<field name="price_unit"/>
+							</group>
+							<group>
+								<field name="date_planned" widget="date" readonly="1"/>
+								<field name="company_id" groups="base.group_multi_company" widget="selection"/>
+								<field name="account_analytic_id" colspan="4" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
+								<field name="taxes_id" widget="many2many_tags"
+									domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
+								<field name="invoiced"/>
+							</group>
+						</group>
 	                    <separator string="Manual Invoices"/>
-	                    <field name="invoice_lines"/>
-	                    <separator string="Notes"/>
-	                    <field name="notes" placeholder="Add a note on the purchase line..."/>
-	                    <separator string="Stock Moves"/>
-	                    <field name="move_ids"/>
+						<field name="invoice_lines"/>
+						<separator string="Notes"/>
+						<field name="notes"/>
+						<separator string="Stock Moves"/>
+						<field name="move_ids"/>
 	            	</sheet>
                 </form>
             </field>

From 3f353e1e13665117764f49569f2d5ed4d857e0f8 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Thu, 21 Jun 2012 11:16:51 +0530
Subject: [PATCH 7/9] [IMP]Purchase Quotations : Changes Child view

bzr revid: hsa@tinyerp.com-20120621054651-wd2p078h3rf1491q
---
 addons/purchase/purchase_view.xml | 77 +++++++++----------------------
 1 file changed, 23 insertions(+), 54 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 0d6afe3f80a..1638c33acd5 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -166,26 +166,7 @@
                     <notebook>
                         <page string="Purchase Order">
                             <field name="order_line">
-                            	<form string="Purchase Order Lines" version="7.0">
-                            	<header>
-                                        <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
-                                </header>
-                                <group col="4" colspan="4">
-                                	<group>
-                                		<field name="product_id"/>
-                                		<field name="product_qty"/>
-                                    	<field name="price_unit"/>
-                                    	<field name="taxes_id" widget="many2many_tags"
-												domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/> 
-                                	</group>
-                                	<group>
-                                		<field name="name"/>
-                                		<field name="date_planned"/>
-										<field name="account_analytic_id" colspan="2" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
-										<field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                	</group>
-                                </group>
-                            	</form>
+                            	
                                 <tree string="Purchase Order Lines">
                                 	<field name="date_planned"/>
                                     <field name="name"/>
@@ -351,40 +332,28 @@
             <field name="model">purchase.order.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Purchase Order Line" version="7.0">
-                    <sheet>
-                        <label for="name" class="oe_edit_only"/>
-                        <h1><field name="name"/></h1>
-                        <label for="product_id" class="oe_edit_only"/>
-                        <group>
-                            <group>
-                                <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)"/>
-                                <label for="product_qty"/>
-                                <div>
-                                    <field name="product_qty" on_change="onchange_product_id(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)" class="oe_inline"/>
-                                    <field name="product_uom" groups="product.group_uom" on_change="onchange_product_uom(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)" class="oe_inline"/>
-                                </div>
-                                <field name="price_unit"/>
-                            </group>
-                            <group>
-                                <field name="date_planned" widget="date"/>
-                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                <field name="account_analytic_id" colspan="4" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]" />
-                                <field name="taxes_id" widget="many2many_tags"
-                                    domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
-                            </group>
-                            <group string="Notes" colspan="4">
-                                <field name="notes"/>
-                            </group>
-                            <group string="Invoices" colspan="4">
-                                <field name="invoiced"/>
-                                <field name="invoice_lines" nolabel="1" colspan="2"/>
-                            </group>
-                            <separator string="Stock Moves"/>
-                            <field name="move_ids"/>
-                        </group>
-                    </sheet>
-                </form>
+                <form string="Purchase Order Lines" version="7.0">
+				    <header>
+				        <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
+				    </header>
+				    <group col="4" colspan="4">
+				    <group>
+					    <field name="product_id"/>
+					    <field name="product_qty"/>
+				     	<field name="price_unit"/>
+				     	<field name="taxes_id" widget="many2many_tags"
+					        domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/> 
+				    </group>
+				    <group>
+					    <field name="name"/>
+					    <field name="date_planned"/>
+				        <field name="account_analytic_id" colspan="2" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
+				        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+				    </group>
+				    </group>
+				    <separator string="Notes"/>
+				    <field name="notes" placeholder="Add a note on the purchase line..."/>
+				</form>
             </field>
         </record>
 

From 2065b790137b0fea226df847c3fbb9e45687b953 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 21 Jun 2012 12:45:16 +0530
Subject: [PATCH 8/9] [IMP]Purchase: set space instead of tab and some minore
 changes

bzr revid: dbr@tinyerp.com-20120621071516-wlhx0y6f8idkg0q2
---
 addons/purchase/purchase_view.xml | 54 ++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 1638c33acd5..331613f3b7e 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -326,34 +326,42 @@
         </record>
         <menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="menu_procurement_management" sequence="6"/>
 
-
         <record id="purchase_order_line_form" model="ir.ui.view">
             <field name="name">purchase.order.line.form</field>
             <field name="model">purchase.order.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Purchase Order Lines" version="7.0">
-				    <header>
-				        <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
-				    </header>
-				    <group col="4" colspan="4">
-				    <group>
-					    <field name="product_id"/>
-					    <field name="product_qty"/>
-				     	<field name="price_unit"/>
-				     	<field name="taxes_id" widget="many2many_tags"
-					        domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/> 
-				    </group>
-				    <group>
-					    <field name="name"/>
-					    <field name="date_planned"/>
-				        <field name="account_analytic_id" colspan="2" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
-				        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-				    </group>
-				    </group>
-				    <separator string="Notes"/>
-				    <field name="notes" placeholder="Add a note on the purchase line..."/>
-				</form>
+                <form string="Purchase Order Line" version="7.0">
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)"/>
+                                <label for="product_qty"/>
+                                <div>
+                                <field name="product_qty" on_change="onchange_product_id(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)" class="oe_inline"/>
+                                <field name="product_uom" groups="product.group_uom" on_change="onchange_product_uom(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,notes,context)" class="oe_inline"/>
+                                </div>
+                                <field name="price_unit"/>
+                                <field name="taxes_id" widget="many2many_tags" domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/> 
+                            </group>
+                            <group>
+                                <field name="name"/>
+                                <field name="date_planned" widget="date"/>
+                                <field name="account_analytic_id" colspan="2" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]" />
+                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            </group>
+                            <group string="Notes" colspan="4">
+                                <field name="notes" nolabel="1" placeholder="Add a note on the purchase line..."/>
+                            </group>
+                            <group string="Invoices" colspan="4">
+                                <field name="invoice_lines" nolabel="1"/>
+                            </group>
+                            <group string="Stock Moves" colspan="4">
+                                <field name="move_ids" nolabel="1"/>
+                            </group>
+                        </group>
+                    </sheet>
+                </form>
             </field>
         </record>
 

From 9d19d51f1c1cc852396ef2a9f92e202c98df1b38 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 21 Jun 2012 12:55:51 +0530
Subject: [PATCH 9/9] [REM]purchase: remove all changes for
 purchase_order_line_form2

bzr revid: dbr@tinyerp.com-20120621072551-1baov2yznmoj1qyf
---
 addons/purchase/purchase_view.xml | 72 +++++++++++++++----------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 331613f3b7e..e5ad3a19ce0 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -392,42 +392,42 @@
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
                 <form string="Purchase Order Line" version="7.0">
-                	<sheet>
-	                    <label for="order_id" class="oe_edit_only"/>
-						<h1>
-						<field name="order_id" class="oe_inline"/>,
-						<field name="date_order" class="oe_inline"/>
-						</h1>
-						<label for="partner_id" class="oe_edit_only"/>
-						<h2><field name="partner_id"/></h2>
-						
-						<group>
-	                    	<group>
-								<field name="name"/>
-								<field name="product_id" readonly="1"/>
-								<label for="product_qty"/>
-								<div>
-								<field name="product_qty" readonly="1" class="oe_inline"/>
-								<field name="product_uom" readonly="1" groups="product.group_uom" class="oe_inline"/>
-								</div>
-								<field name="price_unit"/>
-							</group>
-							<group>
-								<field name="date_planned" widget="date" readonly="1"/>
-								<field name="company_id" groups="base.group_multi_company" widget="selection"/>
-								<field name="account_analytic_id" colspan="4" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
-								<field name="taxes_id" widget="many2many_tags"
-									domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
-								<field name="invoiced"/>
-							</group>
-						</group>
-	                    <separator string="Manual Invoices"/>
-						<field name="invoice_lines"/>
-						<separator string="Notes"/>
-						<field name="notes"/>
-						<separator string="Stock Moves"/>
-						<field name="move_ids"/>
-	            	</sheet>
+                    <sheet>
+                        <label for="order_id" class="oe_edit_only"/>
+                        <h1>
+                            <field name="order_id" class="oe_inline"/>, 
+                            <field name="date_order" class="oe_inline"/>
+                        </h1>
+                        <label for="partner_id" class="oe_edit_only"/>
+                        <h2><field name="partner_id"/></h2>
+    
+                        <group>
+                            <group>
+                                <field name="name"/>
+                                <field name="product_id" readonly="1"/>
+                                <label for="product_qty"/>
+                                <div>
+                                    <field name="product_qty" readonly="1" class="oe_inline"/>
+                                    <field name="product_uom" readonly="1" groups="product.group_uom" class="oe_inline"/>
+                                </div>
+                                <field name="price_unit"/>
+                            </group>
+                            <group>
+                                <field name="date_planned" widget="date"  readonly="1"/>
+                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                <field name="account_analytic_id" colspan="4" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
+                                <field name="taxes_id" widget="many2many_tags"
+                                    domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
+                                <field name="invoiced"/>
+                            </group>
+                        </group>
+                        <separator string="Manual Invoices"/>
+                        <field name="invoice_lines"/>
+                        <separator string="Notes"/>
+                        <field name="notes"/>
+                        <separator string="Stock Moves"/>
+                        <field name="move_ids"/>
+                    </sheet>
                 </form>
             </field>
         </record>