Merge lp:~openerp-dev/openobject-addons/trunk-purchase-requisition-procurement-fix-csn into lp:openobject-addons

[Cedric Snauwaert (OpenERP)]

Using procurement to create a purchase requisition instead of a quotation was not working because procurement workflow was not correct for that case.

Modify procurement workflow to make it work with purchase requisition (this needed a workflow for the purchase requisition). Also, in order for procurement workflow to finish, we need to complete the stock move, so had to add a move_dest_id on purchase requisition object in order to forward it to quotation generated from the purchase requisition.

[Paulius Sladkevičius @ hbee (komsas)]

I've tried to apply this patch on the v7.0. I've made few test. It worked fine.

What I'm missing here are unit-tests that could 100% approve correct behavior of procurement workflow with PR.

[Stefan Rijnhart (Opener) (stefan-opener)]

Just to say that I'm basing my work to merge purchase requisitions[1] on this branch and it's working fine. However, your branch now probably has conflicts due to an improvement on retrieving the warehouse from a procurement order.

[1] https://code.launchpad.net/~therp-nl/openobject-addons/trunk-merge_purchase_requisitions/+merge/192871

Unmerged revisions

8758. By Cedric Snauwaert (OpenERP) on 2013-06-10

[FIX]purchase_requisition: missing import

8757. By Cedric Snauwaert (OpenERP) on 2013-06-10

[FIX]purchase_requisition: fix procurement workflow in case we want to create a requisition instead of a quotation when using procurement for a product. It needs to separate the workflow

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2013-05-21 12:23:59 +0000
+++ purchase/purchase.py	2013-06-11 08:11:29 +0000
@@ -1060,6 +1060,8 @@
                 return False
         return True
 
+    def check_product_requisition(self, cr, uid, ids, context=None):
+        return False
 
     def action_po_assign(self, cr, uid, ids, context=None):
         """ This is action which call from workflow to assign purchase order to procurements

=== modified file 'purchase/purchase_workflow.xml'
--- purchase/purchase_workflow.xml	2013-04-29 14:01:42 +0000
+++ purchase/purchase_workflow.xml	2013-06-11 08:11:29 +0000
@@ -214,7 +214,7 @@
         <record id="trans_confirm_mto_purchase" model="workflow.transition">
             <field name="act_from" ref="procurement.act_confirm_mto"/>
             <field name="act_to" ref="act_buy"/>
-            <field name="condition">check_buy() and check_supplier_info()</field>
+            <field name="condition">check_buy() and check_supplier_info() and not check_product_requisition()</field>
         </record>
 
         <record id="trans_buy_make_done" model="workflow.transition">

=== modified file 'purchase_requisition/__openerp__.py'
--- purchase_requisition/__openerp__.py	2012-11-29 22:26:45 +0000
+++ purchase_requisition/__openerp__.py	2013-06-11 08:11:29 +0000
@@ -39,6 +39,7 @@
               'purchase_requisition_data.xml',
               'purchase_requisition_view.xml',
               'purchase_requisition_report.xml',
+              'purchase_requisition_workflow.xml',
               'security/ir.model.access.csv','purchase_requisition_sequence.xml'
     ],
     'auto_install': False,

=== modified file 'purchase_requisition/purchase_requisition.py'
--- purchase_requisition/purchase_requisition.py	2013-04-15 10:23:49 +0000
+++ purchase_requisition/purchase_requisition.py	2013-06-11 08:11:29 +0000
@@ -24,6 +24,7 @@
 import time
 
 from openerp.osv import fields,osv
+from openerp import netsvc
 from openerp.tools.translate import _
 import openerp.addons.decimal_precision as dp
 
@@ -42,6 +43,7 @@
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'purchase_ids' : fields.one2many('purchase.order','requisition_id','Purchase Orders',states={'done': [('readonly', True)]}),
         'line_ids' : fields.one2many('purchase.requisition.line','requisition_id','Products to Purchase',states={'done': [('readonly', True)]}),
+        'move_dest_id': fields.many2one('stock.move', 'Reservation Destination', ondelete='set null'),
         'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse'),        
         'state': fields.selection([('draft','New'),('in_progress','Sent to Suppliers'),('cancel','Cancelled'),('done','Purchase Done')],
             'Status', track_visibility='onchange', required=True)
@@ -77,7 +79,13 @@
         return self.write(cr, uid, ids, {'state':'in_progress'} ,context=context)
 
     def tender_reset(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state': 'draft'})
+        self.write(cr, uid, ids, {'state': 'draft'})
+        wf_service = netsvc.LocalService("workflow")
+        for p_id in ids:
+            # Deleting the existing instance of workflow for PO
+            wf_service.trg_delete(uid, 'purchase.requisition', p_id, cr)
+            wf_service.trg_create(uid, 'purchase.requisition', p_id, cr)
+        return True
 
     def tender_done(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state':'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
@@ -160,6 +168,7 @@
                     'price_unit': seller_price,
                     'date_planned': date_planned,
                     'taxes_id': [(6, 0, taxes)],
+                    'move_dest_id': requisition.move_dest_id.id,
                 }, context=context)
                 
         return res
@@ -246,6 +255,7 @@
                     'date_end': procurement.date_planned,
                     'warehouse_id':warehouse_id and warehouse_id[0] or False,
                     'company_id':procurement.company_id.id,
+                    'move_dest_id':procurement.move_id.id,
                     'line_ids': [(0,0,{
                         'product_id': procurement.product_id.id,
                         'product_uom_id': procurement.product_uom.id,
@@ -258,5 +268,10 @@
             res = super(procurement_order, self).make_po(cr, uid, ids, context=context)
         return res
 
+    def check_product_requisition(self, cr, uid, ids, context=None):
+        procurement = self.browse(cr, uid, ids, context=context)[0]
+        if procurement.product_id.purchase_requisition:
+            return True
+        return False
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'purchase_requisition/purchase_requisition_view.xml'
--- purchase_requisition/purchase_requisition_view.xml	2013-02-25 13:38:04 +0000
+++ purchase_requisition/purchase_requisition_view.xml	2013-06-11 08:11:29 +0000
@@ -30,10 +30,10 @@
         <field name="arch" type="xml">
             <form string="Purchase Requisition" version="7.0">
             <header>
-                <button name="tender_in_progress" states="draft" string="Send to Suppliers" type="object" class="oe_highlight"/>
-                <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" />
-                <button name="tender_done" states="in_progress" string="Purchase Done" type="object" class="oe_highlight"/>
-                <button name="tender_cancel" states="draft,in_progress" string="Cancel Requisition" type="object" />
+                <button name="sent_suppliers" states="draft" string="Send to Suppliers" class="oe_highlight"/>
+                <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object"/>
+                <button name="done" states="in_progress" string="Purchase Done" class="oe_highlight"/>
+                <button name="cancel_requisition" states="draft,in_progress" string="Cancel Requisition"  />
                 <field name="state" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/>
             </header>
             <sheet>

=== added file 'purchase_requisition/purchase_requisition_workflow.xml'
--- purchase_requisition/purchase_requisition_workflow.xml	1970-01-01 00:00:00 +0000
+++ purchase_requisition/purchase_requisition_workflow.xml	2013-06-11 08:11:29 +0000
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="purchase_requisition_workflow" model="workflow">
+            <field name="name">Purchase Requisition Basic Workflow</field>
+            <field name="osv">purchase.requisition</field>
+            <field name="on_create">True</field>
+        </record>
+
+        <record id="act_draft" model="workflow.activity">
+            <field name="wkf_id" ref="purchase_requisition_workflow"/>
+            <field name="flow_start">True</field>
+            <field name="name">draft</field>
+        </record>
+        <record id="act_sent" model="workflow.activity">
+            <field name="wkf_id" ref="purchase_requisition_workflow"/>
+            <field name="name">sent</field>
+            <field name="kind">function</field>
+            <field name="action">tender_in_progress()</field>
+        </record>
+        <record id="act_cancel" model="workflow.activity">
+            <field name="wkf_id" ref="purchase_requisition_workflow"/>
+            <field name="name">cancel</field>
+            <field name="kind">function</field>
+            <field name="flow_stop">True</field>
+            <field name="action">tender_cancel()</field>
+        </record>
+        <record id="act_done" model="workflow.activity">
+            <field name="wkf_id" ref="purchase_requisition_workflow"/>
+            <field name="name">done</field>
+            <field name="action">tender_done()</field>
+            <field name="kind">function</field>
+            <field name="flow_stop">True</field>
+        </record>
+
+        <record id="trans_draft_sent" model="workflow.transition">
+            <field name="act_from" ref="act_draft"/>
+            <field name="act_to" ref="act_sent"/>
+            <field name="signal">sent_suppliers</field>
+        </record>
+         <record id="trans_draft_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_draft"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">cancel_requisition</field>
+        </record>
+        <record id="trans_sent_done" model="workflow.transition">
+            <field name="act_from" ref="act_sent"/>
+            <field name="act_to" ref="act_done"/>
+            <field name="signal">done</field>
+        </record>
+        <record id="trans_sent_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_sent"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">cancel_requisition</field>
+        </record>
+
+    <!-- Procurement -->
+        <record id="act_buy_req" model="workflow.activity">
+            <field name="wkf_id" ref="procurement.wkf_procurement"/>
+            <field name="name">buy_requisition</field>
+            <field name="kind">subflow</field>
+            <field name="subflow_id" search="[('osv','=','purchase.requisition')]"/>
+            <field name="action">action_po_assign()</field>
+        </record>
+
+        <record id="trans_confirm_mto_purchase_req" model="workflow.transition">
+            <field name="act_from" ref="procurement.act_confirm_mto"/>
+            <field name="act_to" ref="act_buy_req"/>
+            <field name="condition">check_buy() and check_supplier_info() and check_product_requisition()</field>
+        </record>
+
+        <record id="trans_buy_make_done_req" model="workflow.transition">
+            <field name="act_from" ref="act_buy_req"/>
+            <field name="act_to" ref="procurement.act_make_done"/>
+            <field name="signal">subflow.done</field>
+        </record>
+
+        <record id="trans_buy_cancel_req" model="workflow.transition">
+            <field name="act_from" ref="act_buy_req"/>
+            <field name="act_to" ref="procurement.act_cancel"/>
+            <field name="signal">subflow.cancel</field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file