From 330975ee7fc40f8308783588ac339ce429cd42ea Mon Sep 17 00:00:00 2001
From: "Jay (OpenERP)" <jvo@tinyerp.com>
Date: Thu, 26 Aug 2010 00:37:01 +0530
Subject: [PATCH] [FIX] SO/PO should be allowed to cancel by un-linking
 relavent picking

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

bzr revid: jvo@tinyerp.com-20100825190701-gszxsb81u1lofkkv
---
 addons/purchase/stock.py       |  2 +-
 addons/purchase/stock_view.xml | 29 +++++++++++++++++++++++++++--
 addons/sale/stock.py           |  2 +-
 addons/sale/stock_view.xml     | 15 +++++++++++++++
 4 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index 245da72cad8..49a28e352b2 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -40,7 +40,7 @@ class stock_picking(osv.osv):
     _inherit = 'stock.picking'
     _columns = {
         'purchase_id': fields.many2one('purchase.order', 'Purchase Order',
-            ondelete='set null', select=True, readonly=True),
+            ondelete='set null', select=True),
     }
     _defaults = {
         'purchase_id': lambda *a: False,
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 867f48f6fe0..a991b79d0e9 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -19,7 +19,32 @@
             id="act_purchase_order_2_stock_picking"
             name="Picking"
             res_model="stock.picking"
-            src_model="purchase.order"/>
-
+            src_model="purchase.order"
+            context="{'contact_display': 'partner'}" />
+       
+       <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"/>
+            <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">
+            <field name="name">Incoming Picking Inherited</field>
+            <field name="model">stock.picking</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="stock.view_picking_in_form"/>
+            <field name="arch" type="xml">
+                <field name="backorder_id" position="after">
+                    <field name="purchase_id"/>
+                </field>
+            </field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index d8df1901024..39260e759b4 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -35,7 +35,7 @@ stock_move()
 class stock_picking(osv.osv):
     _inherit = 'stock.picking'
     _columns = {
-        'sale_id': fields.many2one('sale.order', 'Sale Order', ondelete='set null', select=True, readonly=True),
+        'sale_id': fields.many2one('sale.order', 'Sale Order', ondelete='set null', select=True),
     }
     _defaults = {
         'sale_id': False
diff --git a/addons/sale/stock_view.xml b/addons/sale/stock_view.xml
index 2e9e7e0b66e..73df12db523 100644
--- a/addons/sale/stock_view.xml
+++ b/addons/sale/stock_view.xml
@@ -12,5 +12,20 @@
                 </field>
             </field>
         </record>
+        
+        <!-- Adding Sale Order Reference to outgoing picking -->
+        
+        <record id="stock_picking_out_inherit_sale" model="ir.ui.view">
+            <field name="name">Outgoing picking Inherited</field>
+            <field name="model">stock.picking</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="stock.view_picking_out_form"/>
+            <field name="arch" type="xml">
+                <field name="move_type" position="after">
+                    <field name="sale_id"/>
+                </field>
+            </field>
+        </record>
+
     </data>
 </openerp>