Merge lp:~openerp-dev/openobject-addons/6.0-opw_cancel_mo_4634-ach into lp:openobject-addons/6.0

[Anup(SerpentCS)]

Hello,

   When mrp_operations installed it's not possible to cancel a manufacturing order.

This solution fixes the issue.

Thanks.

[Jay Vora (Serpent Consulting Services) (jayvora)]

review: Approve

=== modified file 'mrp_operations/mrp_operations.py'
--- mrp_operations/mrp_operations.py	2011-01-14 00:11:01 +0000
+++ mrp_operations/mrp_operations.py	2011-03-30 08:49:50 +0000
@@ -244,10 +244,12 @@
             wf_service.trg_validate(uid, 'mrp.production.workcenter.line', workcenter_line.id, 'button_start_working', cr)
         return super(mrp_production,self).action_in_production(cr, uid, ids)
     
-    def action_cancel(self, cr, uid, ids):
+    def action_cancel(self, cr, uid, ids,context=None):
         """ Cancels work order if production order is canceled.
         @return: Super method
         """
+        if context is None:
+            context = {}
         obj = self.browse(cr, uid, ids)[0]
         wf_service = netsvc.LocalService("workflow")
         for workcenter_line in obj.workcenter_lines: