Merge lp:~donkirkby/openobject-addons/mrp-jit-restart into lp:openobject-addons/5.0

[Don Kirkby]

[Don Kirkby (donkirkby)]

This is my suggestion for fixing bug lp:522977. I took the simplistic approach of just triggering the button_restart signal on all the procurements after the stock picking has been confirmed for a sales order. There may be a way to change the order of things so that the procurement can just flow all the way through its work flow the first time, but I'm not familiar enough with it to know.

I have done two simple tests for this fix:
1. I created a new database with the mrp_jit module and the sample data, and then created and confirmed a sales order for a PC1 product. The order immediately appeared in the Available Packing list for outgoing products. This was the original bug scenario.
2. I did the exact same scenario, but on a database without the mrp_jit module. No errors were raised, and the order appeared in the Available Packing list after I ran the Compute All Schedulers wizard.

[Olivier Dony (Odoo) (odo-openerp)]

As indicated in the MP, this does not seem to be the correct way to fix the issue, but I need to analyze it further (which is why I'm only commenting now - review will follow)

mrp_jit is a trivial module to short-circuit the trigger signal before the procurement computation, so the regular procurement workflow should indeed handle this case in a graceful manner.

[Olivier Dony (Odoo) (odo-openerp)]

Further analysis: this was broken by revision 1634, it used to work before:
  http://bazaar.launchpad.net/~openerp/openobject-addons/5.0/revision/1634

The workaround I propose instead of this 'button_restart' hack, and short of reverting rev 1634, is to allow mrp.procurement.action_confirm() to also confirm draft stock.moves, not just 'waiting' ones.
This change also seems sensible and correct to me.

The patch is trivial, but as I said on bug 522977, I still need a test case before landing it on stable. Hopefully I will be able to do that tomorrow before 5.0.7.

If you want to help test it, I will attach the patch to the bug now.

review: Disapprove (incorrect functional patch)

=== modified file 'sale/sale.py'
--- sale/sale.py	2010-02-08 13:14:47 +0000
+++ sale/sale.py	2010-02-19 22:25:23 +0000
@@ -567,6 +567,7 @@
         for order in self.browse(cr, uid, ids, context={}):
             output_id = order.shop_id.warehouse_id.lot_output_id.id
             picking_id = False
+            proc_ids = []
             for line in order.order_line:
                 proc_id = False
                 date_planned = DateTime.now() + DateTime.DateTimeDeltaFromDays(line.delay or 0.0)
@@ -625,6 +626,7 @@
                         'move_id': move_id,
                         'property_ids': [(6, 0, [x.id for x in line.property_ids])],
                     })
+                    proc_ids.append(proc_id)
                     wf_service = netsvc.LocalService("workflow")
                     wf_service.trg_validate(uid, 'mrp.procurement', proc_id, 'button_confirm', cr)
                     self.pool.get('sale.order.line').write(cr, uid, [line.id], {'procurement_id': proc_id})
@@ -640,6 +642,7 @@
                         'procure_method': line.type,
                         'property_ids': [(6, 0, [x.id for x in line.property_ids])],
                     })
+                    proc_ids.append(proc_id)
                     self.pool.get('sale.order.line').write(cr, uid, [line.id], {'procurement_id': proc_id})
                     wf_service = netsvc.LocalService("workflow")
                     wf_service.trg_validate(uid, 'mrp.procurement', proc_id, 'button_confirm', cr)
@@ -653,6 +656,10 @@
             if picking_id:
                 wf_service = netsvc.LocalService("workflow")
                 wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
+                for proc_id in proc_ids:
+                    wf_service = netsvc.LocalService("workflow")
+                    wf_service.trg_validate(uid, 'mrp.procurement', proc_id, 'button_restart', cr)
+                    
 
             if order.state == 'shipping_except':
                 val['state'] = 'progress'