From f2d8c68370a3ccca858721b0e0b6b277186adce5 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 9 Jul 2010 14:56:48 +0530
Subject: [PATCH] [Add] purchase_requisition: Add the requisition_id in
 procurement

bzr revid: sbh@tinyerp.com-20100709092648-imdg0ji0is4to797
---
 addons/purchase/purchase.py                         |  2 +-
 addons/purchase_requisition/purchase_requisition.py |  8 ++++++--
 .../purchase_requisition_view.xml                   | 13 ++++++++++++-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 82e01735b00..d70ea13d39b 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -720,7 +720,7 @@ purchase_order_line()
 class procurement_order(osv.osv):
     _inherit = 'procurement.order'
     _columns = {
-        'purchase_id': fields.many2one('purchase.order', 'Latest Requisition'),
+        'purchase_id': fields.many2one('purchase.order', 'Purchase Order'),
     }
 
     def action_po_assign(self, cr, uid, ids, context={}):
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index db05650354b..7f7c10a0c8a 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -155,14 +155,17 @@ product_product()
 class procurement_order(osv.osv):
 
     _inherit = 'procurement.order'
-
+    _columns = {
+        'requisition_id' : fields.many2one('purchase.requisition','Latest Requisition')
+    }
     def make_po(self, cr, uid, ids, context=None):
         sequence_obj = self.pool.get('ir.sequence')
         res = super(procurement_order, self).make_po(cr, uid, ids, context=context)
         for proc_id, po_id in res.items():
             procurement = self.browse(cr, uid, proc_id)
+            requisition_id=False
             if procurement.product_id.purchase_requisition:
-                self.pool.get('purchase.requisition').create(cr, uid, {
+                requisition_id=self.pool.get('purchase.requisition').create(cr, uid, {
                     'name': sequence_obj.get(cr, uid, 'purchase.order.requisition'),
                     'origin': procurement.name,
                     'date_end': procurement.date_planned,
@@ -174,6 +177,7 @@ class procurement_order(osv.osv):
                     })],
                     'purchase_ids': [(6,0,[po_id])]
                 })
+            self.write(cr,uid,proc_id,{'requisition_id':requisition_id})    
         return res
 
 procurement_order()
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 76aa70aaf42..b8e488ac0cf 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -168,6 +168,17 @@
             </field>
         </field>
     </record>
-
+    
+    <record model="ir.ui.view" id="procurement_normal_form_view_inherit">
+        <field name="name">procurement.form.inherit</field>
+        <field name="type">form</field>
+        <field name="model">procurement.order</field>
+        <field name="inherit_id" ref="procurement.procurement_form_view"/>
+        <field name="arch" type="xml">
+             <xpath expr="/form/notebook/page/field[@name='close_move']" position="after">
+                <field name="requisition_id"/>
+            </xpath>
+        </field>
+    </record>
     </data>
 </openerp>