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] [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'))]"