Merge lp:~hbee/openobject-addons/7.0-merge_purchase_requisitions_wkf_fix into lp:~therp-nl/openobject-addons/7.0-merge_purchase_requisitions

[Paulius Sladkevičius @ hbee]

Without workflow redirect of merged requisitions procurements get stuck

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

Thanks! I gather that this code redirects the requisition subflow on the procurement order. I think this change ignores the possibility of a requisition with remaining lines. The target branch for that reason moves the actual link betwee procurements and requisitions to the level of the requisition line. Therefore, it seems to me that the workflow should be redirected when the requisition_line_id is written to the procurement order, in make_po(). What do you think?

review: Needs Information

[Paulius Sladkevičius @ hbee (komsas)]

Mine code redirects removed requisitions to a new created requisitions, that should be fine. Your concern about remaining lines is correct, that should be handled too.

I see problem that requisition line don't have states or workflow, like a task/stock move.
What about situation when half requisition lines will be merged others not, when procurement should go to done/cancel state? Theoretically I think it should go when both requisitions workflow are finished.

To solve this we should take similar why how is stock move or tasks are handled on the procurement, but problem is that we have procurement subflow to requisition not to requisition line.

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

Can you please expand on the problems that you foresee? I don't see the problem so far.

Procurement orders can only refer to a single line. When the wizard in this branch unlinks a requisition because it has no lines, there should not be a purchase order refering to it.

When requisitions are merged and then later on split up again, updating the individual procurement orders subflow with the new requisition ids derived from the requisition lines should suffice. Then, when a requisition is cancelled, the procurement workflow should pick this up automatically.

While it is true that requisition lines do not have state, their requisitions do and the wizard only works on lines from draft requisitions (+ additional restrictions) so repartitioning those should not affect their procurement orders' workflow states.

Am I missing something?

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

Oh, I can think of one issue now, when looking at this branch: https://code.launchpad.net/~openerp-dev/openobject-addons/7.0-opw-593185-rha/+merge/166651 (merged in OCB). This cleans up requisitions when procurements are cancelled. That is obviously not compatible with merged requisitions. It should probably be refactored to raise an error saying that the procurement can only be cancelled once the requisition has been cleaned up manually if there are more than one lines on the requisition.

[Paulius Sladkevičius @ hbee (komsas)]

You are right, if you update procurement orders subflow individually when they will be merged to a new requisition it should work fine. Let me know (like a reviewer I suppose) to check a new code regarding this issue, then I could test it out. If you don't plan to make it I could try to check out where to put such patch.

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

Hi Paulius,

to follow up on this issue, I started out by merging your branch (also to give you credits). I ended up though as expected by reverting your fix and updating the procurement subflows based on the requisition ids of each requisition line with a ridiculous sql query here: http://bazaar.launchpad.net/~therp-nl/openobject-addons/7.0-merge_purchase_requisitions/revision/9553.

Thank you very much for pointing out the workflow issues and suggesting a fix!

=== modified file 'purchase_requisition/wizard/purchase_requisition_merge.py'
--- purchase_requisition/wizard/purchase_requisition_merge.py	2013-10-29 09:29:53 +0000
+++ purchase_requisition/wizard/purchase_requisition_merge.py	2013-11-03 19:35:11 +0000
@@ -23,6 +23,7 @@
 
 from openerp.osv import orm, fields
 from openerp.tools.translate import _
+from openerp import netsvc
 
 
 class purchase_requisition_merge(orm.TransientModel):
@@ -63,12 +64,13 @@
 
         @return: act window to the form view of the newly created requisition
         """
+        wf_service = netsvc.LocalService("workflow")
         merge = self.browse(cr, uid, merge_ids[0], context=context)
         if not merge.line_ids:
             orm.except_orm(
                 _('Error'),
                 _('Please select a number of requisition lines to merge.'))
-            
+
         # Get a unique set of requisitions from the list of lines
         requisitions = list(set(
                 [line.requisition_id for line in merge.line_ids]))
@@ -89,12 +91,14 @@
         requisition_obj.write(
             cr, uid, target_requisition_id,
             {'date_end': minimum_date_planned}, context=context)
-            
+
         requisitions[0].refresh()
-        requisition_obj.unlink(
-            cr, uid,
-            [req.id for req in requisitions if not req.line_ids],
-            context=context)
+
+        requisitions = [req.id for req in requisitions if not req.line_ids]
+        for old_id in requisitions:
+            wf_service.trg_redirect(uid, 'purchase.requisition', old_id,
+                                    target_requisition_id, cr)
+        requisition_obj.unlink(cr, uid, requisitions, context=context)
 
         return {
             'type': 'ir.actions.act_window',