From 3c2c745fa61ed3c2c3df9e46602f763db7587649 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 20 Jun 2012 14:21:20 +0530
Subject: [PATCH 01/38] [IMP]purchase:  improve the purchase form view

bzr revid: dbr@tinyerp.com-20120620085120-l19503yk32ea1kkc
---
 addons/purchase/purchase_view.xml             | 40 +++++++++----------
 .../purchase_requisition_view.xml             |  2 +-
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 5c107d984ce..72f50a78cf8 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -173,36 +173,34 @@
                                     <field name="price_subtotal"/>
                                 </tree>
                             </field>
-                            <group class="oe_subtotal_footer">
+                            <group class="oe_subtotal_footer" col="4">
                                 <field name="amount_untaxed"/>
+                                <newline/>
                                 <field name="amount_tax"/>
-                                <field name="amount_total" class="oe_subtotal_footer_separator"/>
-                                <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
+                                <newline/>
+                                <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute" colspan="2"/>
+                                <field name="amount_total" class="oe_subtotal_footer_separator" colspan="2"/>
                             </group>
                             <div class="oe_clear"/>
                             <label for="notes"/>
                             <field name="notes"/>
                         </page>
                         <page string="Delivery &amp; Invoicing">
-                            <group>
-                                <group string="Delivery">
-                                    <field name="dest_address_id" on_change="onchange_dest_address_id(dest_address_id)"/>
-                                    <field name="minimum_planned_date"/>
-                                    <field name="location_id" groups="stock.group_locations"/>
-                                    <field name="shipped"/>
-                                </group>
-                                <group string="Invoice Control">
-                                    <field name="invoice_method"/>
-                                    <field name="fiscal_position" widget="selection"/>
-                                    <field name="invoiced"/>
-                                </group>
-                                <group groups="base.group_no_one" string="Purchase Control">
-                                    <field name="validator"/>
-                                    <field name="date_approve"/>
-                                </group>
-                                <separator string="Invoices"/>
-                                <field name="invoice_ids" context="{'type':'in_invoice', 'journal_type':'purchase'}"/>
+                            <group string="Delivery" col="4">
+                                <field name="dest_address_id" string="Customer Address" on_change="onchange_dest_address_id(dest_address_id)"/>
+                                <field name="minimum_planned_date"/>
+                                <field name="validator" groups="base.group_no_one"/>
+                                <field name="location_id" groups="stock.group_locations"/>
+                                <field name="date_approve"/>
+                                <field name="shipped" groups="base.group_no_one"/>
                             </group>
+                            <group string="Invoice Control" col="4">
+                                <field name="invoice_method"/>
+                                <field name="fiscal_position" widget="selection"/>
+                                <field name="invoiced"/>
+                            </group>
+                            <separator string="Invoices"/>
+                            <field name="invoice_ids" context="{'type':'in_invoice', 'journal_type':'purchase'}"/>
                         </page>
                     </notebook>
                 </sheet>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 7d5c6ee4b79..11d6e361abc 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -9,7 +9,7 @@
         <field name="model">purchase.order</field>
         <field name="inherit_id" ref="purchase.purchase_order_form"/>
         <field name="arch" type="xml">
-            <field name="shipped" position="after">
+            <field name="dest_address_id" position="after">
                 <field name="requisition_id"/>
             </field>
         </field>

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 02/38] [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 a8e6b7fa13a368f06921adc7b1d91ae27f897eb7 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 20 Jun 2012 16:05:43 +0530
Subject: [PATCH 03/38] [IMP]purchas: set Incomming Shipment button

bzr revid: dbr@tinyerp.com-20120620103543-61tgvau4eka1jh31
---
 addons/purchase/purchase_view.xml | 12 +++++++-----
 addons/purchase/stock_view.xml    | 18 +++++++++++++++---
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 72f50a78cf8..9c37752912b 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -143,11 +143,13 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
                 </header>
                 <sheet>
-                    <h1>
-                        <label string="Draft Purchase Order " attrs="{'invisible': [('state','not in',('draft','sent'))]}"/>
-                        <label string="Purchase Order " attrs="{'invisible': [('state','in',('draft','sent'))]}"/>
-                        <field name="name" class="oe_inline" readonly="1"/>
-                    </h1>
+                    <div class="oe_title">
+                        <h1>
+                            <label string="Draft Purchase Order " attrs="{'invisible': [('state','not in',('draft','sent'))]}"/>
+                            <label string="Purchase Order " attrs="{'invisible': [('state','in',('draft','sent'))]}"/>
+                            <field name="name" class="oe_inline" readonly="1"/>
+                        </h1>
+                    </div>
                     <group>
                         <group>
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_supplier':1,'default_supplier':1,'default_customer':0}"  options='{"quick_create": false}'/>
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 3abf56c9ec4..10dda4dfd0a 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -25,7 +25,6 @@
         </record>
 
         <act_window
-            domain="[('purchase_id', '=', active_id)]"
             id="act_purchase_order_2_stock_picking"
             name="Incoming Shipments"
             res_model="stock.picking.in"
@@ -36,13 +35,11 @@
             <field eval="1" name="sequence"/>
             <field name="view_mode">tree</field>
             <field name="view_id" ref="stock.view_picking_in_tree"/>
-            <field name="act_window_id" ref="act_purchase_order_2_stock_picking"/>
         </record>
         <record id="action_picking_in_form_view" model="ir.actions.act_window.view">
             <field eval="2" name="sequence"/>
             <field name="view_mode">form</field>
             <field name="view_id" ref="stock.view_picking_in_form"/>
-            <field name="act_window_id" ref="act_purchase_order_2_stock_picking"/>
         </record>
         
         <record id="stock_picking_in_inherit_purchase" model="ir.ui.view">
@@ -57,6 +54,21 @@
             </field>
         </record>
         
+        <record id="purchase_order_2_stock_picking" model="ir.ui.view">
+            <field name="name">Purchase Picking Inherited</field>
+            <field name="model">purchase.order</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="purchase.purchase_order_form"/>
+            <field name="arch" type="xml">
+                 <xpath expr="//div[contains(@class, 'oe_title')]" position="before">
+                    <div class="oe_right oe_button_box" name="buttons">
+                        <button type="action"
+                            name="%(act_purchase_order_2_stock_picking)d"
+                            string="Incoming Shipments"/>
+                    </div>
+                </xpath>
+            </field>
+        </record>
         <!-- Picking to Invoice -->
         <record id="view_picking_in_search_picking_to_invoice" model="ir.ui.view">
             <field name="name">stock.picking.in.search</field>

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 04/38] [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 05/38] [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 06/38] [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 07/38] [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 51d4e48e92091519ad277b169eecb48b0cd18b92 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 20 Jun 2012 17:43:28 +0530
Subject: [PATCH 08/38] [IMP]purchas: set Incomming Shipment button for
 purchase order only

bzr revid: dbr@tinyerp.com-20120620121328-xv93qvdozyob4y92
---
 addons/purchase/stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 10dda4dfd0a..59d36a98903 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -64,7 +64,7 @@
                     <div class="oe_right oe_button_box" name="buttons">
                         <button type="action"
                             name="%(act_purchase_order_2_stock_picking)d"
-                            string="Incoming Shipments"/>
+                            string="Incoming Shipments" states="approved"/>
                     </div>
                 </xpath>
             </field>

From 6e299d80feae5939d8f1f13ed026caefd4f49e88 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 20 Jun 2012 18:49:20 +0530
Subject: [PATCH 09/38] [IMP]stock: Receive Products form view

add labels on fields Pack and Serial Number

bzr revid: dbr@tinyerp.com-20120620131920-2sp9fbr85qvcs5i9
---
 addons/stock/stock_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index ff75c333b11..1bf9da1023e 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1444,7 +1444,7 @@
                     </group>
 
                     <group>
-                        <label name="tracking_id"/>
+                        <label for="tracking_id"/>
                         <div>
                             <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
                             <button name="%(split_into)d" string="New Pack" type="action"
@@ -1452,7 +1452,7 @@
                               icon="terp-stock_effects-object-colorize"
                               states="draft,assigned,confirmed,done" colspan="1"/>
                         </div>
-                        <label name="prodlot_id"/>
+                        <label for="prodlot_id"/>
                         <div>
                             <field name="prodlot_id" groups="stock.group_production_lot"
                                 context="{'location_id':location_id, 'product_id':product_id}"

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 10/38] [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 11/38] [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 6fa33e21646c298162e246704388ca1b9fd618c6 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 21 Jun 2012 11:37:04 +0530
Subject: [PATCH 12/38] [IMP]purchase: Remove Incoming Shipment from more

bzr revid: dbr@tinyerp.com-20120621060704-driru0f03yd23u9v
---
 addons/purchase/stock_view.xml | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 59d36a98903..84e2d0900b2 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -24,22 +24,14 @@
             </field>
         </record>
 
-        <act_window
-            id="act_purchase_order_2_stock_picking"
-            name="Incoming Shipments"
-            res_model="stock.picking.in"
-            src_model="purchase.order"
-            context="{'default_purchase_id': active_id, 'contact_display': 'partner', 'default_type': 'in'}" />
-       
-        <record id="action_picking_in_tree_view" model="ir.actions.act_window.view">
-            <field eval="1" name="sequence"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="stock.view_picking_in_tree"/>
-        </record>
-        <record id="action_picking_in_form_view" model="ir.actions.act_window.view">
-            <field eval="2" name="sequence"/>
+       <record model="ir.actions.act_window" id="act_purchase_order_2_stock_picking">
+            <field name="name">Incoming Shipments</field>
+            <field name="res_model">stock.picking.in</field>
+            <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="stock.view_picking_in_form"/>
+            <field name="context">{'default_purchase_id': active_id, 'contact_display': 'partner', 'default_type': 'in'}</field>
+            <field name="target">new</field>
         </record>
         
         <record id="stock_picking_in_inherit_purchase" model="ir.ui.view">

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 13/38] [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 14/38] [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>

From 1fbe1ed2ccc3d281c695e9d3baede593eb58cf7d Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Thu, 21 Jun 2012 15:11:10 +0530
Subject: [PATCH 15/38] [IMP]Based On Draft Invoice : change form view

bzr revid: hsa@tinyerp.com-20120621094110-w0imsro09w5te5jv
---
 addons/account/account_invoice_view.xml | 26 ++++++++-----------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 58a1abac364..f51fa343809 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -146,7 +146,7 @@
             <field name="type">form</field>
             <field name="priority">2</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+               <form string="Draft Invoice" version="7.0">
                 <header>
                     <button name="invoice_open" states="draft,proforma2" string="Validate"/>
                     <button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid'/>
@@ -156,34 +156,24 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                 </header>
                 <sheet string="Supplier Invoice">
-                    <group>
+                    <group col="4" colspan="4">
                         <group>
-                            <field string="Supplier" name="partner_id"
-                              on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
-                              context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"
-                              domain="[('supplier', '=', True)]"/>
-                            <field name="fiscal_position" widget="selection"/>
-                        </group>
-                        <group>
-                            <field name="number"/>
                             <field name="date_invoice"/>
+                            <field name="date_due"/>
                             <field name="period_id" domain="[('state', '=', 'draft')]"
                                 groups="account.group_account_user" widget="selection"/>
-                            <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"
-                                groups="account.group_account_user"/>
-                            <field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]"
-                                name="account_id" groups="account.group_account_user"/>
-                            <field name="currency_id"/>
-                            <field name="type" invisible="1"/>
                         </group>
                         <group>
+                            <field name="fiscal_position" widget="selection"/>
+                            <field name="currency_id"/>
+                        </group>
+                    </group>
+                    <group>
                             <label for="reference"/>
                             <div>
                                 <field name="reference_type"/>
                                 <field name="reference" placeholder="Payment Reference"/>
                             </div>
-                            <field name="date_due"/>
-                        </group>
                     </group>
                     <notebook>
                         <page string="Invoice">

From a920a0cbd9ed3721055432009e0424fd1049d4cb Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Thu, 21 Jun 2012 15:24:02 +0530
Subject: [PATCH 16/38] [IMP]Based On Draft Invoice : change o2m in tree view

bzr revid: hsa@tinyerp.com-20120621095402-n2snwud0xy27o1jh
---
 addons/account/account_invoice_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index f51fa343809..8850789c89a 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -180,7 +180,6 @@
                             <field context="{'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False, 'type': type}" name="invoice_line">
                                 <tree string="Invoice lines">
                                     <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
-                                    <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id,parent.partner_id,parent.type,parent.fiscal_position,account_id)"/>
                                     <field name="invoice_line_tax_id" view_mode="2" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/>
                                     <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                     <field name="quantity"/>

From f278880a55591dd0b6992623ae99770f6151110d Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Thu, 21 Jun 2012 15:43:12 +0530
Subject: [PATCH 17/38] [IMP]Based On Draft Invoice : change o2m tree view in
 other info and payement tab

bzr revid: hsa@tinyerp.com-20120621101312-qe1ocn494cz32xnz
---
 addons/account/account_invoice_view.xml | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 8850789c89a..ce9dfa0e89e 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -222,26 +222,20 @@
                         <page string="Other Info">
                             <group col="4">
                                 <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
-                                <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
+                                <field name="user_id"/>
                                 <newline/>
                                 <field name="payment_term" widget="selection"/>
-                                <field name="name"/>
                                 <newline/>
-                                <field name="origin" placeholder="PO0025"/>
-                                <field name="user_id"/>
-                                <field name="move_id" groups="account.group_account_user"/>
+                                <field name="name"/>
+                                <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
                             </group>
                         </page>
                         <page string="Payments">
                             <field name="payment_ids">
                                 <tree string="Payments">
                                     <field name="date" string="Payment Date"/>
-                                    <field name="move_id"/>
                                     <field name="ref"/>
                                     <field name="name"/>
-                                    <field name="journal_id"/>
-                                    <field name="debit"/>
-                                    <field name="credit"/>
                                     <field name="amount_currency"/>
                                     <field name="currency_id"/>
                                 </tree>

From c564447c42d445bf62d0c2b865c0afbc1344338f Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 21 Jun 2012 16:33:27 +0530
Subject: [PATCH 18/38] [IMP] Purchase, stock: Improve view of Receive Products
 and Incoming shipments

bzr revid: dbr@tinyerp.com-20120621110327-w0jxyrunrjejt2qx
---
 addons/purchase/purchase_view.xml             |  1 -
 addons/purchase/stock_view.xml                |  2 +-
 .../purchase_requisition_view.xml             |  1 +
 addons/stock/stock_view.xml                   | 31 ++++++++++++-------
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index e5ad3a19ce0..dabad5214d5 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -400,7 +400,6 @@
                         </h1>
                         <label for="partner_id" class="oe_edit_only"/>
                         <h2><field name="partner_id"/></h2>
-    
                         <group>
                             <group>
                                 <field name="name"/>
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 84e2d0900b2..1e3bbe14238 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -27,11 +27,11 @@
        <record model="ir.actions.act_window" id="act_purchase_order_2_stock_picking">
             <field name="name">Incoming Shipments</field>
             <field name="res_model">stock.picking.in</field>
+            <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="stock.view_picking_in_form"/>
             <field name="context">{'default_purchase_id': active_id, 'contact_display': 'partner', 'default_type': 'in'}</field>
-            <field name="target">new</field>
         </record>
         
         <record id="stock_picking_in_inherit_purchase" model="ir.ui.view">
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 11d6e361abc..b6371b77252 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -42,6 +42,7 @@
             </header>
             <sheet>
                 <label for="name" class="oe_edit_only"/>
+                <label for="origin" class="oe_edit_only"/>
                 <h1>
                     <field name="name" class="oe_inline"/>, 
                     <field name="origin" class="oe_inline"/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index d0d380db717..6d76d36ad4c 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1395,6 +1395,14 @@
             </field>
         </record>
 
+       <record model="ir.actions.act_window" id="act_relate_picking">
+            <field name="name">Related Picking</field>
+            <field name="res_model">stock.picking</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="stock.vpicktree"/>
+            <field name="context">{'default_move_lines': active_id}</field>
+        </record>
 
         <record id="view_move_form_reception_picking" model="ir.ui.view">
             <field name="name">stock.move.form2</field>
@@ -1411,6 +1419,11 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
                 </header>
                 <sheet>
+                <div class="oe_right oe_button_box" name="buttons">
+                    <button type="action"
+                        name="%(act_relate_picking)d"
+                        string="Related Picking"/>
+                </div>
                 <group>
                     <group>
                         <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
@@ -1433,15 +1446,16 @@
                     </group>
                     <group>
                         <field name="picking_id"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                        <field name="location_id" groups="stock.group_locations"/>
-                        <field name="location_dest_id" groups="stock.group_locations"/>
-                        <field name="partner_id"/>
                         <field name="create_date" groups="base.group_no_one" />
                         <field name="date" groups="base.group_no_one" />
                         <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
                     </group>
-
+                    <group>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        <field name="location_id" groups="stock.group_locations"/>
+                        <field name="location_dest_id" groups="stock.group_locations"/>
+                        <field name="partner_id"/>
+                    </group>
                     <group>
                         <label for="tracking_id"/>
                         <div>
@@ -1610,13 +1624,6 @@
             res_model="stock.move"
             src_model="product.product"/>
 
-        <act_window
-            domain="[('move_lines','=',active_id)]"
-            id="act_relate_picking"
-            name="Related Picking"
-            res_model="stock.picking"
-            src_model="stock.move"/>
-
         <act_window
             context="{'search_default_future': 1,'search_default_product_id': [active_id], 'default_product_id': active_id}"
             domain="[('state','in',('waiting','confirmed','assigned'))]"

From d2033d21b5e746cbeeec8e9ecadb5217555f19bd Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Thu, 21 Jun 2012 17:06:38 +0530
Subject: [PATCH 19/38] [IMP]Purchase Invoice Control Based on Purchase Order
 Line Comma is remove

bzr revid: hsa@tinyerp.com-20120621113638-ceunkw3zl7144pe2
---
 addons/account/account_invoice_view.xml | 13 ++++++++++---
 addons/purchase/purchase_view.xml       |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index ce9dfa0e89e..d29f58c3073 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -156,7 +156,11 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                 </header>
                 <sheet string="Supplier Invoice">
-                    <group col="4" colspan="4">
+                    <group>
+                        <field string="Supplier" name="partner_id"
+                              on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
+                              context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"
+                              domain="[('supplier', '=', True)]" invisible="1"/>
                         <group>
                             <field name="date_invoice"/>
                             <field name="date_due"/>
@@ -180,6 +184,7 @@
                             <field context="{'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False, 'type': type}" name="invoice_line">
                                 <tree string="Invoice lines">
                                     <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
+                                    <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id,parent.partner_id,parent.type,parent.fiscal_position,account_id)"/>
                                     <field name="invoice_line_tax_id" view_mode="2" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/>
                                     <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                     <field name="quantity"/>
@@ -225,8 +230,6 @@
                                 <field name="user_id"/>
                                 <newline/>
                                 <field name="payment_term" widget="selection"/>
-                                <newline/>
-                                <field name="name"/>
                                 <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
                             </group>
                         </page>
@@ -238,6 +241,10 @@
                                     <field name="name"/>
                                     <field name="amount_currency"/>
                                     <field name="currency_id"/>
+                                    <field name="move_id" invisible="1"/>
+                                    <field name="journal_id" invisible="1"/>
+                                    <field name="debit" invisible="1"/>
+                                    <field name="credit" invisible="1"/>
                                 </tree>
                             </field>
                         </page>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index e5ad3a19ce0..fd0cb9327ac 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -395,7 +395,7 @@
                     <sheet>
                         <label for="order_id" class="oe_edit_only"/>
                         <h1>
-                            <field name="order_id" class="oe_inline"/>, 
+                            <field name="order_id" class="oe_inline"/> 
                             <field name="date_order" class="oe_inline"/>
                         </h1>
                         <label for="partner_id" class="oe_edit_only"/>

From 2fb6faaf6c334bfc6bd453e85569d6f94da87c75 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 21 Jun 2012 18:13:28 +0530
Subject: [PATCH 20/38] [IMP]account: Improve header for form view

bzr revid: dbr@tinyerp.com-20120621124328-2fwjk7ap1cqvp8dg
---
 addons/account/account_invoice_view.xml | 26 +++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index d29f58c3073..835189726dd 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -156,28 +156,36 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                 </header>
                 <sheet string="Supplier Invoice">
-                    <group>
-                        <field string="Supplier" name="partner_id"
+                    <div class="oe_title">
+                        <h1>
+                            <field name="number" class="oe_inline"/>
+                        </h1>
+                        <h2>
+                            <field name="origin" placeholder="PO0025"/>from
+                            <field string="Supplier" name="partner_id"
                               on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
                               context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"
-                              domain="[('supplier', '=', True)]" invisible="1"/>
+                              domain="[('supplier', '=', True)]"/>
+                        </h2>
+                    </div>
+                    <group>
                         <group>
                             <field name="date_invoice"/>
                             <field name="date_due"/>
-                            <field name="period_id" domain="[('state', '=', 'draft')]"
-                                groups="account.group_account_user" widget="selection"/>
+                            <field name="type" invisible="1"/>
+                            <field name="period_id" domain="[('state', '=', 'draft')]" groups="account.group_account_user" widget="selection"/>
                         </group>
                         <group>
                             <field name="fiscal_position" widget="selection"/>
                             <field name="currency_id"/>
+                            <field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]" name="account_id" groups="account.group_account_user" invisible="1"/>
                         </group>
-                    </group>
-                    <group>
+                        <group>
                             <label for="reference"/>
                             <div>
-                                <field name="reference_type"/>
                                 <field name="reference" placeholder="Payment Reference"/>
                             </div>
+                        </group>
                     </group>
                     <notebook>
                         <page string="Invoice">
@@ -228,7 +236,9 @@
                             <group col="4">
                                 <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
                                 <field name="user_id"/>
+                                <field name="name" invisible="1"/>
                                 <newline/>
+                                <field name="move_id" groups="account.group_account_user" invisible="1"/>
                                 <field name="payment_term" widget="selection"/>
                                 <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
                             </group>

From 0b98166e73f1863e0aa6907d02433a89828d307d Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 22 Jun 2012 11:25:24 +0530
Subject: [PATCH 21/38] [IMP] account, product: account : Improve view for
 account_invoice_view.xml account : Improve view for product_view.xml product
 : Improve product category as well as uom view file stock : Improve product
 inherited view

bzr revid: dbr@tinyerp.com-20120622055524-j3erbqup81u72f6f
---
 addons/account/account_invoice_view.xml     | 17 ++++++++++-------
 addons/account/product_view.xml             | 14 ++++++++------
 addons/account_anglo_saxon/product_view.xml | 13 +++++++------
 addons/product/product_view.xml             | 21 ++++++++++++---------
 addons/stock/product_view.xml               | 18 ++++++++++--------
 5 files changed, 47 insertions(+), 36 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 835189726dd..4e1db78616b 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -192,15 +192,15 @@
                             <field context="{'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False, 'type': type}" name="invoice_line">
                                 <tree string="Invoice lines">
                                     <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
-                                    <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id,parent.partner_id,parent.type,parent.fiscal_position,account_id)"/>
                                     <field name="invoice_line_tax_id" view_mode="2" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/>
                                     <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                     <field name="quantity"/>
                                     <field name="price_unit"/>
-                                     <!-- Removed if subtotal is set -->
                                     <field name="price_subtotal"/>
-                                    <field invisible="True" name="name"/>
-                                    <field invisible="True" name="uos_id"/>
+                                    <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id,parent.partner_id,parent.type,parent.fiscal_position,account_id)" invisible="1"/>
+                                    <!-- Removed if subtotal is set -->
+                                    <field name="name" invisible="1"/>
+                                    <field name="uos_id" invisible="1"/>
                                 </tree>
                             </field>
                             <group>
@@ -234,14 +234,17 @@
                         </page>
                         <page string="Other Info">
                             <group col="4">
+                            <group>
                                 <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
+                                <field name="payment_term" widget="selection"/>
+                            </group>
+                            <group>
                                 <field name="user_id"/>
                                 <field name="name" invisible="1"/>
-                                <newline/>
                                 <field name="move_id" groups="account.group_account_user" invisible="1"/>
-                                <field name="payment_term" widget="selection"/>
                                 <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
                             </group>
+                            </group>
                         </page>
                         <page string="Payments">
                             <field name="payment_ids">
@@ -249,7 +252,7 @@
                                     <field name="date" string="Payment Date"/>
                                     <field name="ref"/>
                                     <field name="name"/>
-                                    <field name="amount_currency"/>
+                                    <field name="amount_currency" string="Amount"/>
                                     <field name="currency_id"/>
                                     <field name="move_id" invisible="1"/>
                                     <field name="journal_id" invisible="1"/>
diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml
index 73bf64893ba..7959062df2b 100644
--- a/addons/account/product_view.xml
+++ b/addons/account/product_view.xml
@@ -51,12 +51,14 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_category_form_view"/>
             <field name="arch" type="xml">
-                <form position="inside">
-                    <group string="Accounting Properties">
-                        <field name="property_account_income_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                        <field name="property_account_expense_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                    </group>
-                </form>
+                <data>
+                    <xpath expr="/form/sheet//group[@name='basic']" position="inside">
+                        <group string="Accounting Properties">
+                            <field name="property_account_income_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                            <field name="property_account_expense_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                        </group>
+                    </xpath>
+                </data>
             </field>
         </record>
 
diff --git a/addons/account_anglo_saxon/product_view.xml b/addons/account_anglo_saxon/product_view.xml
index 8a79d96d1c4..a342438dca5 100644
--- a/addons/account_anglo_saxon/product_view.xml
+++ b/addons/account_anglo_saxon/product_view.xml
@@ -34,12 +34,13 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_category_form_view"/>
             <field name="arch" type="xml">
-                <form position="inside">
-                    <group>
-                        <separator string="Accounting Property" colspan="2"/>
-                        <field name="property_account_creditor_price_difference_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                    </group>
-                </form>
+                <data>
+                    <xpath expr="/form/sheet//group[@name='basic']" position="before">
+                        <group string="Accounting Property">
+                            <field name="property_account_creditor_price_difference_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                        </group>
+                    </xpath>
+                </data>
             </field>
         </record>
 
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index ce95cc8a044..1063121438e 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -311,12 +311,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Product Categories" version="7.0">
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="parent_id"/>
-                        <field name="sequence" invisible="1"/>
-                        <field name="type"/>
-                    </group>
+                    <sheet>
+                        <group>
+                            <field name="name"/>
+                            <field name="parent_id"/>
+                            <field name="sequence" invisible="1"/>
+                            <field name="type"/>
+                        </group>
+                        <group name="basic" col="4"/>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -415,9 +418,9 @@
                         </group>
                         <group string="Ratio &amp; Precision">
                             <field name="uom_type" on_change="onchange_type(uom_type)"/>
-                            <field name="rounding"/>
-                            <field name="factor" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
-                            <label string="  e.g: 1 * (reference unit) = ratio * (this unit)" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
+                            <field name="rounding" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
+                            <field name="factor" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
+                            <label string="  e.g: 1 * (reference unit) = ratio * (this unit)" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
                             <field name="factor_inv" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
                             <label string="  e.g: 1 * (this unit) = ratio * (reference unit)" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
                         </group>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 09fa784e56a..b06ecf868b7 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -21,14 +21,16 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_category_form_view"/>
             <field name="arch" type="xml">
-                <form position="inside" version="7.0">
-                    <group string="Accounting Stock Properties">
-                        <field name="property_stock_account_input_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                        <field name="property_stock_account_output_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                        <field name="property_stock_valuation_account_id" domain="[('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
-                        <field name="property_stock_journal"/>
-                    </group>
-                </form>
+                <data>
+                    <xpath expr="/form/sheet//group[@name='basic']" position="inside">
+                        <group string="Accounting Stock Properties">
+                            <field name="property_stock_account_input_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                            <field name="property_stock_account_output_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                            <field name="property_stock_valuation_account_id" domain="[('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
+                            <field name="property_stock_journal"/>
+                        </group>
+                    </xpath>
+                </data>
             </field>
         </record>
 

From c579b919cc49ec60eb632f34a9027fe6fac1d598 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 22 Jun 2012 11:48:17 +0530
Subject: [PATCH 22/38] [IMP]purchase: View imp for cpompute btn and total

bzr revid: dbr@tinyerp.com-20120622061817-2kgmzi6i9rw6zu5x
---
 addons/purchase/purchase_view.xml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 9c1cf285b63..9027a86f365 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -166,9 +166,8 @@
                     <notebook>
                         <page string="Purchase Order">
                             <field name="order_line">
-                            	
                                 <tree string="Purchase Order Lines">
-                                	<field name="date_planned"/>
+                                    <field name="date_planned"/>
                                     <field name="name"/>
                                     <field name="product_qty"/>
                                     <field name="product_uom" groups="product.group_uom"/>
@@ -176,13 +175,13 @@
                                     <field name="price_subtotal"/>  
                                 </tree>
                             </field>
-                            <group class="oe_subtotal_footer" col="4">
+                            <group class="oe_subtotal_footer">
                                 <field name="amount_untaxed"/>
-                                <newline/>
                                 <field name="amount_tax"/>
-                                <newline/>
-                                <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute" colspan="2"/>
-                                <field name="amount_total" class="oe_subtotal_footer_separator" colspan="2"/>
+                                <div class="oe_subtotal_footer_separator oe_inline" colspan="2">
+                                    <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute" class="oe_inline"/>
+                                    <field name="amount_total"/>
+                                </div>
                             </group>
                             <div class="oe_clear"/>
                             <label for="notes"/>

From 365eeca8940206164788e8f209d29439c57484ce Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 22 Jun 2012 11:57:46 +0530
Subject: [PATCH 23/38] [IMP] Some minore changes for requisition

bzr revid: dbr@tinyerp.com-20120622062746-072l4ve79ei4iaad
---
 addons/purchase/purchase_view.xml                         | 2 +-
 addons/purchase_requisition/purchase_requisition_view.xml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 9027a86f365..920b5f8f904 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -196,7 +196,7 @@
                                 <field name="date_approve"/>
                                 <field name="shipped" groups="base.group_no_one"/>
                             </group>
-                            <group string="Invoice Control" col="4">
+                            <group string="Invoicing" col="4">
                                 <field name="invoice_method"/>
                                 <field name="fiscal_position" widget="selection"/>
                                 <field name="invoiced"/>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index b6371b77252..e1f51f92384 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -41,10 +41,10 @@
                 <field name="state" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/>
             </header>
             <sheet>
-                <label for="name" class="oe_edit_only"/>
-                <label for="origin" class="oe_edit_only"/>
                 <h1>
-                    <field name="name" class="oe_inline"/>, 
+                    <field name="name" class="oe_inline"/>
+                    <label for="origin" class="oe_edit_only"/>
+                    <label string="," attrs="{'invisible':[('origin','=',False)]}"/>
                     <field name="origin" class="oe_inline"/>
                 </h1>
                 <group>

From 8e263da2330b5131cabde6a33d17697a51fd0578 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 22 Jun 2012 12:20:14 +0530
Subject: [PATCH 24/38] [IMP] the coma should not appears if the date is not
 setted for Based on Purchase Order Lines

bzr revid: dbr@tinyerp.com-20120622065014-f45uy3da24flmfry
---
 addons/purchase/purchase_view.xml | 4 +++-
 addons/stock/stock_view.xml       | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 920b5f8f904..4e2d593d929 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -394,11 +394,13 @@
                     <sheet>
                         <label for="order_id" class="oe_edit_only"/>
                         <h1>
-                            <field name="order_id" class="oe_inline"/> 
+                            <field name="order_id" class="oe_inline"/>
+                            <label string="," attrs="{'invisible':[('date_order','=',False)]}"/> 
                             <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"/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 6d76d36ad4c..7c1afd89431 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1447,7 +1447,7 @@
                     <group>
                         <field name="picking_id"/>
                         <field name="create_date" groups="base.group_no_one" />
-                        <field name="date" groups="base.group_no_one" />
+                        <field name="date" groups="base.group_no_one" string="Move Date"/>
                         <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
                     </group>
                     <group>

From 198debec80a36ccbdb85e880f572a59c43323df4 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 25 Jun 2012 18:21:51 +0530
Subject: [PATCH 25/38] [IMP]:purchase:improved purchase view

bzr revid: apa@tinyerp.com-20120625125151-2uqtxa7jd3qu47i7
---
 addons/purchase/purchase_view.xml | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 2136b63ba97..fa5b8d5fbc4 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -193,18 +193,26 @@
                             <field name="notes"/>
                         </page>
                         <page string="Delivery &amp; Invoicing">
-                            <group string="Delivery" col="4">
-                                <field name="dest_address_id" string="Customer Address" on_change="onchange_dest_address_id(dest_address_id)"/>
-                                <field name="minimum_planned_date"/>
-                                <field name="validator" groups="base.group_no_one"/>
-                                <field name="location_id" groups="stock.group_locations"/>
-                                <field name="date_approve"/>
-                                <field name="shipped" groups="base.group_no_one"/>
+                            <group string="Delivery">
+                                <group>
+                                    <field name="dest_address_id" string="Customer Address" on_change="onchange_dest_address_id(dest_address_id)"/>
+                                    <field name="minimum_planned_date"/>
+                                    <field name="location_id" groups="stock.group_locations"/>
+                                    <field name="shipped" groups="base.group_no_one"/>
+                                </group>
+                                <group>
+                                    <field name="validator" groups="base.group_no_one"/>
+                                    <field name="date_approve"/>
+                                </group>
                             </group>
                             <group string="Invoicing" col="4">
-                                <field name="invoice_method"/>
-                                <field name="fiscal_position" widget="selection"/>
-                                <field name="invoiced"/>
+                                <group>
+                                    <field name="invoice_method"/>
+                                    <field name="fiscal_position"/>
+                                </group>
+                                <group>
+                                    <field name="invoiced"/>
+                                </group>
                             </group>
                             <separator string="Invoices"/>
                             <field name="invoice_ids" context="{'type':'in_invoice', 'journal_type':'purchase'}"/>

From a2b34262825cf572ad8125e9cb67cdeb7dec6536 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 26 Jun 2012 11:03:02 +0530
Subject: [PATCH 26/38] [IMP]:improved view

bzr revid: apa@tinyerp.com-20120626053302-mvg99mplc6d83hrl
---
 addons/purchase_requisition/purchase_requisition_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 7c5bfbf076e..ecf5c152166 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -43,8 +43,8 @@
             <sheet>
                 <h1>
                     <field name="name" class="oe_inline"/>
-                    <label for="origin" class="oe_edit_only"/>
                     <label string="," attrs="{'invisible':[('origin','=',False)]}"/>
+                    <label for="origin" class="oe_edit_only"/>
                     <field name="origin" class="oe_inline"/>
                 </h1>
                 <group>

From dd8a5b135a5610983d4f5df898add7e01ad6f960 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 26 Jun 2012 11:44:47 +0530
Subject: [PATCH 27/38] [IMP]:improved receive product view

bzr revid: apa@tinyerp.com-20120626061447-c9q5eubc5t9tgb6s
---
 addons/stock/stock_view.xml | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index b700d48c290..45bab3dbc47 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1442,30 +1442,26 @@
                         <div>
                             <field name="product_uos_qty" groups="product.group_uos" class="oe_inline"
                                 on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)"/>
-                            <field name="product_uos" groups="product.group_uos"/>
+                            <field name="product_uos" groups="product.group_uos" class="oe_inline"/>
                         </div>
                         <field name="name" string="Reason"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
+                        <field name="location_id" groups="stock.group_locations"/>
+                        <field name="location_dest_id" groups="stock.group_locations"/>
+                        <field name="partner_id" groups="stock.group_locations"/>
                     </group>
                     <group>
                         <field name="picking_id"/>
                         <field name="create_date" groups="base.group_no_one" />
                         <field name="date" groups="base.group_no_one" string="Move Date"/>
                         <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
-                    </group>
-                    <group>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                        <field name="location_id" groups="stock.group_locations"/>
-                        <field name="location_dest_id" groups="stock.group_locations"/>
-                        <field name="partner_id" groups="stock.group_locations"/>
-                    </group>
-                    <group>
                         <label for="tracking_id"/>
                         <div>
                             <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
                             <button name="%(split_into)d" string="New Pack" type="action"
                               groups="product.group_stock_packaging"
                               icon="terp-stock_effects-object-colorize"
-                              states="draft,assigned,confirmed,done" colspan="1"/>
+                              states="draft,assigned,confirmed,done" class="oe_inline"/>
                         </div>
                         <label for="prodlot_id"/>
                         <div>
@@ -1474,9 +1470,9 @@
                                 domain="[('product_id','=?',product_id)]" class="oe_inline"
                                 on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)"/>
                             <button name="%(track_line)d"
-                                  groups="stock.group_tracking_lot" class="oe_inline"
-                                  states="draft,waiting,confirmed,assigned,done"
-                                  string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
+                                groups="stock.group_tracking_lot" class="oe_inline"
+                                states="draft,waiting,confirmed,assigned,done"
+                                string="Split" type="action" icon="terp-stock_effects-object-colorize" />
                         </div>
                     </group>
                 </group>

From 64c20ed0221bb069d05e1b5a5979944c7ef7e4b2 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 26 Jun 2012 12:54:37 +0530
Subject: [PATCH 28/38] [IMP]purchase: Remove extra action and set proper one

bzr revid: dbr@tinyerp.com-20120626072437-ixkbier32iic1n54
---
 addons/purchase/stock_view.xml | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 081fe01170c..10d936d541d 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -23,16 +23,6 @@
                 </field>
             </field>
         </record>
-
-       <record model="ir.actions.act_window" id="act_purchase_order_2_stock_picking">
-            <field name="name">Incoming Shipments</field>
-            <field name="res_model">stock.picking.in</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="stock.view_picking_in_form"/>
-            <field name="context">{'default_purchase_id': active_id, 'contact_display': 'partner', 'default_type': 'in'}</field>
-        </record>
         
         <record id="stock_picking_in_inherit_purchase" model="ir.ui.view">
             <field name="name">Incoming Picking Inherited</field>
@@ -55,7 +45,7 @@
                  <xpath expr="//div[contains(@class, 'oe_title')]" position="before">
                     <div class="oe_right oe_button_box" name="buttons">
                         <button type="action"
-                            name="%(act_purchase_order_2_stock_picking)d"
+                            name="%(stock.action_picking_tree4)d"
                             string="Incoming Shipments" states="approved"/>
                     </div>
                 </xpath>

From 234f2257af6928272cfc6d223f7bd42baa91d76f Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 26 Jun 2012 14:20:17 +0530
Subject: [PATCH 29/38] [IMP]purchase: Improve  action

bzr revid: dbr@tinyerp.com-20120626085017-0pjfte5vh0qana92
---
 addons/purchase/stock_view.xml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 10d936d541d..417b15fd325 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -23,7 +23,7 @@
                 </field>
             </field>
         </record>
-        
+
         <record id="stock_picking_in_inherit_purchase" model="ir.ui.view">
             <field name="name">Incoming Picking Inherited</field>
             <field name="model">stock.picking.in</field>
@@ -45,7 +45,7 @@
                  <xpath expr="//div[contains(@class, 'oe_title')]" position="before">
                     <div class="oe_right oe_button_box" name="buttons">
                         <button type="action"
-                            name="%(stock.action_picking_tree4)d"
+                            name="%(act_purchase_order_2_stock_picking)d"
                             string="Incoming Shipments" states="approved"/>
                     </div>
                 </xpath>
@@ -72,6 +72,7 @@
                         <separator orientation="vertical"/>
                         <field name="stock_journal_id" widget="selection"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        <field name="purchase_id" />
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8">
@@ -90,7 +91,16 @@
                 </search>
             </field>
         </record>
- 
+        <record id="act_purchase_order_2_stock_picking" model="ir.actions.act_window">
+            <field name="name">Incoming Shipments</field>
+            <field name="res_model">stock.picking.in</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar</field>
+            <field name="domain">[('type','=','in')]</field>
+            <field name="context">{'search_default_purchase_id': active_id,'default_type': 'in'}</field>
+            <field name="search_view_id" ref="view_picking_in_search_picking_to_invoice"/>
+        </record>
         <record id="action_picking_tree4_picking_to_invoice" model="ir.actions.act_window">
             <field name="name">Based on Incoming Shipments</field>
             <field name="res_model">stock.picking</field>

From b709166984323426e5a262bc613429b122fef1d5 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 26 Jun 2012 14:30:08 +0530
Subject: [PATCH 30/38] [IMP]:purchase:improved code

bzr revid: apa@tinyerp.com-20120626090008-ric6elgrxtq209kt
---
 addons/purchase/stock_view.xml | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 417b15fd325..f9d6239e0a5 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -36,21 +36,6 @@
             </field>
         </record>
         
-        <record id="purchase_order_2_stock_picking" model="ir.ui.view">
-            <field name="name">Purchase Picking Inherited</field>
-            <field name="model">purchase.order</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="purchase.purchase_order_form"/>
-            <field name="arch" type="xml">
-                 <xpath expr="//div[contains(@class, 'oe_title')]" position="before">
-                    <div class="oe_right oe_button_box" name="buttons">
-                        <button type="action"
-                            name="%(act_purchase_order_2_stock_picking)d"
-                            string="Incoming Shipments" states="approved"/>
-                    </div>
-                </xpath>
-            </field>
-        </record>
         <!-- Picking to Invoice -->
         <record id="view_picking_in_search_picking_to_invoice" model="ir.ui.view">
             <field name="name">stock.picking.in.search</field>
@@ -101,6 +86,23 @@
             <field name="context">{'search_default_purchase_id': active_id,'default_type': 'in'}</field>
             <field name="search_view_id" ref="view_picking_in_search_picking_to_invoice"/>
         </record>
+        
+        <record id="purchase_order_2_stock_picking" model="ir.ui.view">
+            <field name="name">Purchase Picking Inherited</field>
+            <field name="model">purchase.order</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="purchase.purchase_order_form"/>
+            <field name="arch" type="xml">
+                 <xpath expr="//div[contains(@class, 'oe_title')]" position="before">
+                    <div class="oe_right oe_button_box" name="buttons">
+                        <button type="action"
+                            name="%(act_purchase_order_2_stock_picking)d"
+                            string="Incoming Shipments" states="approved"/>
+                    </div>
+                </xpath>
+            </field>
+        </record>
+        
         <record id="action_picking_tree4_picking_to_invoice" model="ir.actions.act_window">
             <field name="name">Based on Incoming Shipments</field>
             <field name="res_model">stock.picking</field>

From f408d9f48e4d75b846bf12ae64bbce360d6c6af0 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 27 Jun 2012 11:35:44 +0530
Subject: [PATCH 31/38] [IMP]:improved view

bzr revid: apa@tinyerp.com-20120627060544-7rpuwovdw6c9lnaf
---
 addons/product/product_view.xml   | 12 ++++++++----
 addons/purchase/purchase_view.xml | 12 ++++++------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index ad871158425..81c6380f9b4 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -312,10 +312,14 @@
                 <form string="Product Categories" version="7.0">
                     <sheet>
                         <group>
-                            <field name="name"/>
-                            <field name="parent_id"/>
-                            <field name="sequence" invisible="1"/>
-                            <field name="type"/>
+                            <group>
+                                <field name="name"/>
+                                <field name="type"/>
+                            </group>
+                            <group>
+                                <field name="parent_id"/>
+                                <field name="sequence" invisible="1"/>
+                            </group>
                         </group>
                         <group name="basic" col="4"/>
                     </sheet>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index fa5b8d5fbc4..5358fd1b54a 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -180,20 +180,20 @@
                                     <field name="price_subtotal"/>  
                                 </tree>
                             </field>
-                            <group class="oe_subtotal_footer">
+                            <group class="oe_subtotal_footer oe_right">
                                 <field name="amount_untaxed"/>
                                 <field name="amount_tax"/>
                                 <div class="oe_subtotal_footer_separator oe_inline" colspan="2">
-                                    <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute" class="oe_inline"/>
                                     <field name="amount_total"/>
                                 </div>
                             </group>
+                            <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute" class="oe_inline"/>
                             <div class="oe_clear"/>
                             <label for="notes"/>
                             <field name="notes"/>
                         </page>
                         <page string="Delivery &amp; Invoicing">
-                            <group string="Delivery">
+                            <group>
                                 <group>
                                     <field name="dest_address_id" string="Customer Address" on_change="onchange_dest_address_id(dest_address_id)"/>
                                     <field name="minimum_planned_date"/>
@@ -205,13 +205,13 @@
                                     <field name="date_approve"/>
                                 </group>
                             </group>
-                            <group string="Invoicing" col="4">
+                            <group string="Invoicing">
                                 <group>
                                     <field name="invoice_method"/>
-                                    <field name="fiscal_position"/>
+                                    <field name="invoiced"/>
                                 </group>
                                 <group>
-                                    <field name="invoiced"/>
+                                    <field name="fiscal_position"/>
                                 </group>
                             </group>
                             <separator string="Invoices"/>

From acc3f33f0a089fc82b54b18f65cc6af0a3214901 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 27 Jun 2012 11:40:16 +0530
Subject: [PATCH 32/38] [IMP]:improved view

bzr revid: apa@tinyerp.com-20120627061016-t2zxhsi8fycoxj04
---
 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 5358fd1b54a..6e90fa48c4c 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -184,10 +184,11 @@
                                 <field name="amount_untaxed"/>
                                 <field name="amount_tax"/>
                                 <div class="oe_subtotal_footer_separator oe_inline" colspan="2">
+                                    <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute" class="oe_inline oe_left"/>
                                     <field name="amount_total"/>
                                 </div>
                             </group>
-                            <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute" class="oe_inline"/>
+                            
                             <div class="oe_clear"/>
                             <label for="notes"/>
                             <field name="notes"/>

From 8ea0e115c4f7b2f1d248a208b2181e4684500a3a Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 27 Jun 2012 12:25:41 +0530
Subject: [PATCH 33/38] [IMP]:improved

bzr revid: apa@tinyerp.com-20120627065541-q1h0405f25l1v6xd
---
 addons/stock/stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 45bab3dbc47..1fbfef2346f 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1436,7 +1436,7 @@
                             <button name="%(stock.move_scrap)d"
                                 string="Scrap" type="action"
                                 icon="gtk-convert" context="{'scrap': True}"
-                                states="draft,waiting,confirmed,assigned"/>
+                                states="draft,waiting,confirmed,assigned" colspan="1"/>
                         </div>
                         <label for="product_uos_qty"/>
                         <div>

From 046639e4c27a1b135c56a43a20b2c0dda81a4a64 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 27 Jun 2012 16:53:49 +0530
Subject: [PATCH 34/38] [IMP]:improved view

bzr revid: apa@tinyerp.com-20120627112349-34bt1nvlwdoljnth
---
 addons/purchase_requisition/purchase_requisition_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index ecf5c152166..06cc1b9baad 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -9,7 +9,7 @@
         <field name="model">purchase.order</field>
         <field name="inherit_id" ref="purchase.purchase_order_form"/>
         <field name="arch" type="xml">
-            <field name="dest_address_id" position="after">
+            <field name="validator" position="before">
                 <field name="requisition_id"/>
             </field>
         </field>

From 48c28ba00837f937e7b6e3da4f93f89b2d0017e9 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 29 Jun 2012 18:09:37 +0530
Subject: [PATCH 35/38] [IMP]:purchase_requisition:improved label

bzr revid: apa@tinyerp.com-20120629123937-r9psgvgepliilyw1
---
 addons/purchase_requisition/purchase_requisition_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 8fb5ede3b8b..a213882238a 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -42,12 +42,12 @@
             <sheet>
                 <div class="oe_edit_only">
                     <label for="name" class="oe_inline"/>
-                    <label string="," attrs="{'invisible':[('origin','=',False)]}"/>
                     <label for="origin" class="oe_inline"/>
                 </div>
                 <h1>
                     <field name="name" class="oe_inline"/>
-                    <field name="origin" class="oe_inline"/>
+                    <label string="," attrs="{'invisible':[('origin','=',False)]}"/>
+                    <field name="origin" class="oe_inline" placeholder="PO0025"/>
                 </h1>
                 <group>
                     <group>

From 86f739ad7a74ba8a81a57deebee506a6ac9ffc12 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 2 Jul 2012 16:34:36 +0530
Subject: [PATCH 36/38] [IMP]product_manufacturer: set group and remove
 seprator

bzr revid: dbr@tinyerp.com-20120702110436-5vt1c3vsyn95hz9l
---
 .../product_manufacturer_view.xml             | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/addons/product_manufacturer/product_manufacturer_view.xml b/addons/product_manufacturer/product_manufacturer_view.xml
index 4a19996af66..655dc841d17 100644
--- a/addons/product_manufacturer/product_manufacturer_view.xml
+++ b/addons/product_manufacturer/product_manufacturer_view.xml
@@ -10,19 +10,19 @@
             <field name="arch" type="xml">
                 <notebook position="inside">
                     <page string="Manufacturer">
-                        <separator string="Manufacturer" colspan="4" />
-                        <field name="manufacturer" />
-                        <newline/>
-                        <field name="manufacturer_pname"/>
-                        <field name="manufacturer_pref"/>
-                        
-                        <separator string="Attributes" colspan="4"/>
-                        <field name="attribute_ids" colspan="4" nolabel="1">
-                            <tree string="Product Attributes" editable="bottom">
-                                <field name="name"/>
-                                <field name="value"/>
-                            </tree>
-                        </field>
+                        <group string="Manufacturer">
+                            <field name="manufacturer" />
+                            <field name="manufacturer_pname"/>
+                            <field name="manufacturer_pref"/>
+                        </group>
+                        <group string="Attributes">
+                            <field name="attribute_ids" colspan="4" nolabel="1">
+                                <tree string="Product Attributes" editable="bottom">
+                                    <field name="name"/>
+                                    <field name="value"/>
+                                </tree>
+                            </field>
+                        </group>
                     </page>
                 </notebook>
             </field>

From 52aebcf4341cdad3ecd702aa5051085403ddf80c Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 2 Jul 2012 16:56:53 +0530
Subject: [PATCH 37/38] [IMP]product: Improve product categories form view

bzr revid: dbr@tinyerp.com-20120702112653-qswk4pggbfi6h1p9
---
 addons/account/product_view.xml             |  8 +++-----
 addons/account_anglo_saxon/product_view.xml |  6 ++----
 addons/product/product_view.xml             |  5 ++++-
 addons/stock/product_view.xml               | 12 +++++-------
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml
index 4b73e18b0fa..8591b28b173 100644
--- a/addons/account/product_view.xml
+++ b/addons/account/product_view.xml
@@ -52,11 +52,9 @@
             <field name="inherit_id" ref="product.product_category_form_view"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="/form/sheet//group[@name='basic']" position="inside">
-                        <group string="Accounting Properties">
-                            <field name="property_account_income_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                            <field name="property_account_expense_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                        </group>
+                    <xpath expr="/form/sheet//group[@name='account_property']" position="inside">
+                        <field name="property_account_income_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                        <field name="property_account_expense_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                     </xpath>
                 </data>
             </field>
diff --git a/addons/account_anglo_saxon/product_view.xml b/addons/account_anglo_saxon/product_view.xml
index a342438dca5..b88f8f2db42 100644
--- a/addons/account_anglo_saxon/product_view.xml
+++ b/addons/account_anglo_saxon/product_view.xml
@@ -35,10 +35,8 @@
             <field name="inherit_id" ref="product.product_category_form_view"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="/form/sheet//group[@name='basic']" position="before">
-                        <group string="Accounting Property">
-                            <field name="property_account_creditor_price_difference_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                        </group>
+                    <xpath expr="/form/sheet//group[@name='account_property']" position="inside">
+                        <field name="property_account_creditor_price_difference_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                     </xpath>
                 </data>
             </field>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 75945f4cfb7..f0072e8b3a8 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -323,7 +323,10 @@
                                 <field name="sequence" invisible="1"/>
                             </group>
                         </group>
-                        <group name="basic" col="4"/>
+                        <group name="basic">
+                            <group name="account_property" string="Account Properties"/>
+                            <group name="account_stock_property" string="Account Stock Properties"/>
+                        </group>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 1175cdff3e5..04a0959739a 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -22,13 +22,11 @@
             <field name="inherit_id" ref="product.product_category_form_view"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="/form/sheet//group[@name='basic']" position="inside">
-                        <group string="Accounting Stock Properties">
-                            <field name="property_stock_account_input_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                            <field name="property_stock_account_output_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                            <field name="property_stock_valuation_account_id" domain="[('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
-                            <field name="property_stock_journal"/>
-                        </group>
+                    <xpath expr="/form/sheet//group[@name='account_stock_property']" position="inside">
+                        <field name="property_stock_account_input_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                        <field name="property_stock_account_output_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                        <field name="property_stock_valuation_account_id" domain="[('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
+                        <field name="property_stock_journal"/>
                     </xpath>
                 </data>
             </field>

From 603a4e91b2d5783aa8b86c584e429f5ad780fc31 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 2 Jul 2012 15:38:21 +0200
Subject: [PATCH 38/38] [FIX] purchase, incomming shipments and supplier
 invoice: new form views

bzr revid: qdp-launchpad@openerp.com-20120702133821-6fullwrtfganomz7
---
 addons/account/account_invoice_view.xml | 26 ++++++++++++++-----------
 addons/product/product_view.xml         | 26 ++++++++++++++-----------
 addons/purchase/purchase_view.xml       | 13 ++++++-------
 addons/stock/stock_view.xml             | 15 +-------------
 4 files changed, 37 insertions(+), 43 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 490d7f7c75a..e85a0002bf8 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -145,7 +145,7 @@
             <field name="type">form</field>
             <field name="priority">2</field>
             <field name="arch" type="xml">
-               <form string="Draft Invoice" version="7.0">
+                <form version="7.0">
                 <header>
                     <span groups="base.group_user">
                         <button name="invoice_open" states="draft,proforma2" string="Validate" class="oe_highlight"/>
@@ -159,11 +159,15 @@
                 <sheet string="Supplier Invoice">
                     <div class="oe_title">
                         <h1>
-                            <field name="number" class="oe_inline"/>
+                            <label string="Draft Invoice" attrs="{'invisible': [('state', '&lt;&gt;', 'draft')]}"/>
+                            <label for="number" class="oe_edit_only"  attrs="{'invisible': [('state', '=', 'draft')]}"/>
+                            <field name="number" class="oe_inline"  attrs="{'invisible': [('state', '=', 'draft')]}"/>
                         </h1>
                         <h2>
-                            <field name="origin" placeholder="PO0025"/>from
-                            <field string="Supplier" name="partner_id"
+                            <label for="origin" string="Concerns" class="oe_inline"/>
+                            <field name="origin" placeholder="PO0025" class="oe_inline"/>
+                            <label string=" from " attrs="{'invisible': [('origin', '=', False)]}" class='oe_inline'/>
+                            <field string="Supplier" name="partner_id" class="oe_inline"
                               on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
                               context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"
                               domain="[('supplier', '=', True)]"/>
@@ -235,7 +239,7 @@
                             <field name="comment"/>
                         </page>
                         <page string="Other Info">
-                            <group col="4">
+                            <group>
                             <group>
                                 <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
                                 <field name="payment_term" widget="selection"/>
@@ -243,7 +247,7 @@
                             <group>
                                 <field name="user_id"/>
                                 <field name="name" invisible="1"/>
-                                <field name="move_id" groups="account.group_account_user" invisible="1"/>
+                                <field name="move_id" groups="account.group_account_user"/>
                                 <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
                             </group>
                             </group>
@@ -252,14 +256,14 @@
                             <field name="payment_ids">
                                 <tree string="Payments">
                                     <field name="date" string="Payment Date"/>
+                                    <field name="move_id"/>
                                     <field name="ref"/>
                                     <field name="name"/>
-                                    <field name="amount_currency" string="Amount"/>
+                                    <field name="journal_id"/>
+                                    <field name="debit"/>
+                                    <field name="credit"/>
+                                    <field name="amount_currency"/>
                                     <field name="currency_id"/>
-                                    <field name="move_id" invisible="1"/>
-                                    <field name="journal_id" invisible="1"/>
-                                    <field name="debit" invisible="1"/>
-                                    <field name="credit" invisible="1"/>
                                 </tree>
                             </field>
                         </page>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index f0072e8b3a8..de0080c85c6 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -313,15 +313,19 @@
             <field name="arch" type="xml">
                 <form string="Product Categories" version="7.0">
                     <sheet>
-                        <group>
-                            <group>
+                        <div class="oe_title">
+                            <h1>
+                                <label for="name" class="oe_edit_only"/>
                                 <field name="name"/>
-                                <field name="type"/>
-                            </group>
-                            <group>
-                                <field name="parent_id"/>
-                                <field name="sequence" invisible="1"/>
-                            </group>
+                            </h1>
+                        </div>
+                        <group>
+                                <group>
+                                    <field name="type"/>
+                                </group>
+                                <group>
+                                    <field name="parent_id"/>
+                                </group>
                         </group>
                         <group name="basic">
                             <group name="account_property" string="Account Properties"/>
@@ -426,9 +430,9 @@
                         </group>
                         <group string="Ratio &amp; Precision">
                             <field name="uom_type" on_change="onchange_type(uom_type)"/>
-                            <field name="rounding" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
-                            <field name="factor" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
-                            <label string="  e.g: 1 * (reference unit) = ratio * (this unit)" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
+                            <field name="rounding"/>
+                            <field name="factor" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
+                            <label string="  e.g: 1 * (reference unit) = ratio * (this unit)" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
                             <field name="factor_inv" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
                             <label string="  e.g: 1 * (this unit) = ratio * (reference unit)" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
                         </group>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 5a1b9499494..b56343d625c 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -133,7 +133,7 @@
             <field name="arch" type="xml">
                 <form string="Purchase Order" version="7.0">
                 <header>
-                    <button name="purchase_confirm" states="draft,sent" string="Confirm Order" class="oe_highlight"/>
+                    <button name="purchase_confirm" states="draft,sent" string="Confirm Quotation" class="oe_highlight"/>
                     <button name="wkf_send_rfq" states="draft" string="Send RFQ" type="object" context="{'send_rfq':True}"/>
                     <button name="wkf_send_rfq" states="confirmed" string="Resend Purchase Order" type="object" class="oe_highlight"/>
                     <button name="action_cancel" states="except_picking,except_invoice,wait" string="Cancel" type="object" />
@@ -150,7 +150,7 @@
                 <sheet>
                     <div class="oe_title">
                         <h1>
-                            <label string="Draft Purchase Order " attrs="{'invisible': [('state','not in',('draft','sent'))]}"/>
+                            <label string="Quotation " attrs="{'invisible': [('state','not in',('draft','sent'))]}"/>
                             <label string="Purchase Order " attrs="{'invisible': [('state','in',('draft','sent'))]}"/>
                             <field name="name" class="oe_inline" readonly="1"/>
                         </h1>
@@ -187,15 +187,14 @@
                                     <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute" class="oe_inline oe_left"/>
                                     <field name="amount_total"/>
                                 </div>
-                            </group>
-                            
+                            </group>                         
                             <div class="oe_clear"/>
                             <label for="notes"/>
                             <field name="notes"/>
                         </page>
                         <page string="Delivery &amp; Invoicing">
                             <group>
-                                <group>
+                                <group string="Delivery">
                                     <field name="dest_address_id" string="Customer Address" on_change="onchange_dest_address_id(dest_address_id)"/>
                                     <field name="minimum_planned_date"/>
                                     <field name="location_id" groups="stock.group_locations"/>
@@ -357,8 +356,8 @@
                                 <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"/>
+                                    <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')]"/> 
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index c6923a526bc..9f57e238a66 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1397,14 +1397,6 @@
             </field>
         </record>
 
-       <record model="ir.actions.act_window" id="act_relate_picking">
-            <field name="name">Related Picking</field>
-            <field name="res_model">stock.picking</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="stock.vpicktree"/>
-            <field name="context">{'default_move_lines': active_id}</field>
-        </record>
 
         <record id="view_move_form_reception_picking" model="ir.ui.view">
             <field name="name">stock.move.form2</field>
@@ -1421,18 +1413,13 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
                 </header>
                 <sheet>
-                <div class="oe_right oe_button_box" name="buttons">
-                    <button type="action"
-                        name="%(act_relate_picking)d"
-                        string="Related Picking"/>
-                </div>
                 <group>
                     <group>
                         <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
                         <label for="product_qty"/>
                         <div>
                             <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
-                            <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/>
+                            <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/> 
                             <button name="%(stock.move_scrap)d"
                                 string="Scrap" type="action"
                                 icon="gtk-convert" context="{'scrap': True}"