From ba320d4c2e5c99d51598422001f2ff0d7971de39 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 25 Aug 2010 11:31:18 +0530
Subject: [PATCH] [IMP]purchase_requisition:  Remove the requisition_id from
 purchase order list,purchase order form set Purchase Requisition field  after
 the Received checkbox,  confirm a purchase requisition without purchase_order

bzr revid: sbh@tinyerp.com-20100825060118-wyk1xyijlq2vfnsh
---
 .../purchase_requisition/purchase_requisition.py |  3 ---
 .../purchase_requisition_view.xml                | 16 ++++------------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index 4e7ebb19a64..7e15e06922f 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -64,9 +64,6 @@ class purchase_requisition(osv.osv):
         return True
 
     def tender_in_progress(self, cr, uid, ids, context=None):
-        for quotations in self.browse(cr, uid, ids):
-            if not quotations.purchase_ids:
-                raise osv.except_osv(_('Purchase order required'),('You should have atleast one purchase order line defined for this tender'))
         self.write(cr, uid, ids, {'state':'in_progress'} ,context=context)
         for (id,name) in self.name_get(cr, uid, ids):
                     message = _('Tender') + " '" + name + "' "+ _(" is In Progress")
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 8a9c4375e52..1a64e94c5f6 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -2,17 +2,6 @@
 <openerp>
     <data>
 
-    <record model="ir.ui.view" id="purchase_order_tree_inherit">
-        <field name="name">purchase.order.tree.inherit</field>
-        <field name="type">tree</field>
-        <field name="model">purchase.order</field>
-        <field name="inherit_id" ref="purchase.purchase_order_tree"/>
-        <field name="arch" type="xml">
-            <field name="name" position="after">
-                <field name="requisition_id" groups="base.group_extended"/>
-            </field>
-        </field>
-    </record>
 
     <record model="ir.ui.view" id="purchase_order_form_inherit">
         <field name="name">purchase.order.form.inherit</field>
@@ -20,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="partner_ref" position="after">
+            <field name="shipped" position="after">
                 <field name="requisition_id" groups="base.group_extended"/>
             </field>
         </field>
@@ -77,6 +66,9 @@
                                 <field name="minimum_planned_date"/>
                                 <field name="origin"/>
                                 <field name="state"/>
+								<button name="purchase_confirm" states="draft" string="Confirm Purchase Order" icon="gtk-apply"/>
+                                <button name="purchase_approve" states="confirmed" string="Approved by Supplier" icon="gtk-ok"/>
+                                <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel Purchase Order" icon="gtk-cancel"/>
                             </tree>
                          </field>
                         <separator colspan="4" string=""/>