Merge lp:~openerp-dev/openobject-addons/trunk-workflow-context-odo into lp:openobject-addons

[Olivier Dony (Odoo)]

Work in progress for passing context in business methods who are calling workflows directly or being called by workflows, and as much as possible, downstream.
Basically this boils downs to adding and passing context for all methods on workflow-enabled models, which is a lot of work and dangerous enough... Perhaps a first step instead would be to only care about supporting a context parameter in methods that are directly called by workflows. These are easy to identify, and there is a lot less work to do, _but_ the result will be quite disappointing, as anything beyond the first stack frame downstream of the workflow will likely never see the context anyway.

This branch is not complete yet, and this work is probably too sensitive at this point of releasing 6.1.
See also the prerequisite server branch lp:~openerp-dev/openobject-server/trunk-workflow-context-odo

Unmerged revisions

5838. By Olivier Dony (Odoo) on 2011-12-01

[IMP] workflows: accept and propagate context during workflow execution (wip)

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2011-12-06 10:13:54 +0000
+++ account/account_invoice.py	2011-12-13 18:03:48 +0000
@@ -466,7 +466,7 @@
                 }
         return result
 
-    def onchange_payment_term_date_invoice(self, cr, uid, ids, payment_term_id, date_invoice):
+    def onchange_payment_term_date_invoice(self, cr, uid, ids, payment_term_id, date_invoice, context=None):
         if not payment_term_id:
             return {}
         res = {}
@@ -578,12 +578,12 @@
         return {'value': val, 'domain': dom}
 
     # go from canceled state to draft state
-    def action_cancel_draft(self, cr, uid, ids, *args):
+    def action_cancel_draft(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'draft'})
         wf_service = netsvc.LocalService("workflow")
         for inv_id in ids:
-            wf_service.trg_delete(uid, 'account.invoice', inv_id, cr)
-            wf_service.trg_create(uid, 'account.invoice', inv_id, cr)
+            wf_service.trg_delete(uid, 'account.invoice', inv_id, cr, context=context)
+            wf_service.trg_create(uid, 'account.invoice', inv_id, cr, context=context)
         return True
 
     # Workflow stuff
@@ -591,12 +591,12 @@
 
     # return the ids of the move lines which has the same account than the invoice
     # whose id is in ids
-    def move_line_id_payment_get(self, cr, uid, ids, *args):
+    def move_line_id_payment_get(self, cr, uid, ids, context=None):
         if not ids: return []
-        result = self.move_line_id_payment_gets(cr, uid, ids, *args)
+        result = self.move_line_id_payment_gets(cr, uid, ids, context=context)
         return result.get(ids[0], [])
 
-    def move_line_id_payment_gets(self, cr, uid, ids, *args):
+    def move_line_id_payment_gets(self, cr, uid, ids, context=None):
         res = {}
         if not ids: return res
         cr.execute('SELECT i.id, l.id '\
@@ -630,8 +630,8 @@
             })
         return super(account_invoice, self).copy(cr, uid, id, default, context)
 
-    def test_paid(self, cr, uid, ids, *args):
-        res = self.move_line_id_payment_get(cr, uid, ids)
+    def test_paid(self, cr, uid, ids, context=None):
+        res = self.move_line_id_payment_get(cr, uid, ids, context=context)
         if not res:
             return False
         ok = True
@@ -701,14 +701,14 @@
                 })]
         return iml
 
-    def action_date_assign(self, cr, uid, ids, *args):
+    def action_date_assign(self, cr, uid, ids, context=None):
         for inv in self.browse(cr, uid, ids):
-            res = self.onchange_payment_term_date_invoice(cr, uid, inv.id, inv.payment_term.id, inv.date_invoice)
+            res = self.onchange_payment_term_date_invoice(cr, uid, inv.id, inv.payment_term.id, inv.date_invoice, context=context)
             if res and res['value']:
                 self.write(cr, uid, [inv.id], res['value'])
         return True
 
-    def finalize_invoice_move_lines(self, cr, uid, invoice_browse, move_lines):
+    def finalize_invoice_move_lines(self, cr, uid, invoice_browse, move_lines, context=None):
         """finalize_invoice_move_lines(cr, uid, invoice, move_lines) -> move_lines
         Hook method to be overridden in additional modules to verify and possibly alter the
         move lines to be created by an invoice, for special cases.
@@ -794,12 +794,13 @@
                 line.append((0,0,val))
         return line
 
-    def action_move_create(self, cr, uid, ids, *args):
+    def action_move_create(self, cr, uid, ids, context=None):
         """Creates invoice related analytics and financial move lines"""
         ait_obj = self.pool.get('account.invoice.tax')
         cur_obj = self.pool.get('res.currency')
         period_obj = self.pool.get('account.period')
-        context = {}
+        if context is None:
+            context = {}
         for inv in self.browse(cr, uid, ids):
             if not inv.journal_id.sequence_id:
                 raise osv.except_osv(_('Error !'), _('Please define sequence on invoice journal'))
@@ -815,8 +816,7 @@
             # one move line per invoice line
             iml = self._get_analytic_lines(cr, uid, inv.id)
             # check if taxes are all computed
-            ctx = context.copy()
-            ctx.update({'lang': inv.partner_id.lang})
+            ctx = dict(context, lang=inv.partner_id.lang)
             compute_taxes = ait_obj.compute(cr, uid, inv.id, context=ctx)
             self.check_tax_lines(cr, uid, inv, compute_taxes, ait_obj)
 
@@ -916,7 +916,7 @@
                 raise osv.except_osv(_('UserError'),
                         _('You cannot create an invoice on a centralised journal. Uncheck the centralised counterpart box in the related journal from the configuration menu.'))
 
-            line = self.finalize_invoice_move_lines(cr, uid, inv, line)
+            line = self.finalize_invoice_move_lines(cr, uid, inv, line, context=context)
 
             move = {
                 'ref': inv.reference and inv.reference or inv.name,
@@ -1009,8 +1009,7 @@
                 self.log(cr, uid, inv_id, message, context=ctx)
         return True
 
-    def action_cancel(self, cr, uid, ids, *args):
-        context = {} # TODO: Use context from arguments
+    def action_cancel(self, cr, uid, ids, context=None):
         account_move_obj = self.pool.get('account.move')
         invoices = self.read(cr, uid, ids, ['move_id', 'payment_ids'])
         move_ids = [] # ones that we will need to remove
 
=== modified file 'hr_expense/hr_expense.py'
--- hr_expense/hr_expense.py	2011-11-28 08:06:57 +0000
+++ hr_expense/hr_expense.py	2011-12-13 18:03:48 +0000
@@ -105,14 +105,14 @@
             company_id = employee.company_id.id
         return {'value': {'department_id': department_id, 'company_id': company_id}}
 
-    def expense_confirm(self, cr, uid, ids, *args):
+    def expense_confirm(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {
             'state':'confirm',
             'date_confirm': time.strftime('%Y-%m-%d')
         })
         return True
 
-    def expense_accept(self, cr, uid, ids, *args):
+    def expense_accept(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {
             'state':'accepted',
             'date_valid':time.strftime('%Y-%m-%d'),
@@ -120,11 +120,11 @@
             })
         return True
 
-    def expense_canceled(self, cr, uid, ids, *args):
+    def expense_canceled(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'cancelled'})
         return True
 
-    def expense_paid(self, cr, uid, ids, *args):
+    def expense_paid(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'paid'})
         return True
 
@@ -149,7 +149,7 @@
             'res_id': inv_ids and inv_ids[0] or False,
         }
 
-    def action_invoice_create(self, cr, uid, ids):
+    def action_invoice_create(self, cr, uid, ids, context=None):
         res = False
         invoice_obj = self.pool.get('account.invoice')
         property_obj = self.pool.get('ir.property')
 
=== modified file 'hr_payroll/hr_payroll.py'
--- hr_payroll/hr_payroll.py	2011-11-30 14:01:07 +0000
+++ hr_payroll/hr_payroll.py	2011-12-13 18:03:48 +0000
@@ -336,8 +336,8 @@
         for payslip in self.browse(cr, uid, ids, context=context):
             id_copy = self.copy(cr, uid, payslip.id, {'credit_note': True, 'name': _('Refund: ')+payslip.name}, context=context)
             self.compute_sheet(cr, uid, [id_copy], context=context)
-            wf_service.trg_validate(uid, 'hr.payslip', id_copy, 'hr_verify_sheet', cr)
-            wf_service.trg_validate(uid, 'hr.payslip', id_copy, 'process_sheet', cr)
+            wf_service.trg_validate(uid, 'hr.payslip', id_copy, 'hr_verify_sheet', cr, context=context)
+            wf_service.trg_validate(uid, 'hr.payslip', id_copy, 'process_sheet', cr, context=context)
 
         form_id = mod_obj.get_object_reference(cr, uid, 'hr_payroll', 'view_hr_payslip_form')
         form_res = form_id and form_id[1] or False
 
=== modified file 'mrp/mrp.py'
--- mrp/mrp.py	2011-12-06 08:12:49 +0000
+++ mrp/mrp.py	2011-12-13 18:03:48 +0000
@@ -585,14 +585,14 @@
         }
         return {'value': result}
 
-    def action_picking_except(self, cr, uid, ids):
+    def action_picking_except(self, cr, uid, ids, context=None):
         """ Changes the state to Exception.
         @return: True
         """
         self.write(cr, uid, ids, {'state': 'picking_except'})
         return True
 
-    def action_compute(self, cr, uid, ids, properties=[]):
+    def action_compute(self, cr, uid, ids, properties=[], context=None):
         """ Computes bills of material of a product.
         @param properties: List containing dictionaries of properties.
         @return: No. of products.
@@ -663,15 +663,15 @@
             self.log(cr, uid, production_id, message)
         return True
 
-    def action_production_end(self, cr, uid, ids):
+    def action_production_end(self, cr, uid, ids, context=None):
         """ Changes production state to Finish and writes finished date.
         @return: True
         """
-        for production in self.browse(cr, uid, ids):
-            self._costs_generate(cr, uid, production)
+        for production in self.browse(cr, uid, ids, context=context):
+            self._costs_generate(cr, uid, production, context=context)
         return self.write(cr, uid, ids, {'state': 'done', 'date_finished': time.strftime('%Y-%m-%d %H:%M:%S')})
 
-    def test_production_done(self, cr, uid, ids):
+    def test_production_done(self, cr, uid, ids, context=None):
         """ Tests whether production is done or not.
         @return: True or False
         """
@@ -791,7 +791,7 @@
         wf_service.trg_validate(uid, 'mrp.production', production_id, 'button_produce_done', cr)
         return True
 
-    def _costs_generate(self, cr, uid, production):
+    def _costs_generate(self, cr, uid, production, context=None):
         """ Calculates total costs at the end of the production.
         @param production: Id of production order.
         @return: Calculated amount.
@@ -834,14 +834,14 @@
                     } )
         return amount
 
-    def action_in_production(self, cr, uid, ids):
+    def action_in_production(self, cr, uid, ids, context=None):
         """ Changes state to In Production and writes starting date.
         @return: True
         """
         self.write(cr, uid, ids, {'state': 'in_production', 'date_start': time.strftime('%Y-%m-%d %H:%M:%S')})
         return True
 
-    def test_if_product(self, cr, uid, ids):
+    def test_if_product(self, cr, uid, ids, context=None):
         """
         @return: True or False
         """
@@ -852,10 +852,10 @@
                     res = False
         return res
 
-    def _get_auto_picking(self, cr, uid, production):
+    def _get_auto_picking(self, cr, uid, production, context=None):
         return True
 
-    def action_confirm(self, cr, uid, ids):
+    def action_confirm(self, cr, uid, ids, context=None):
         """ Confirms production order.
         @return: Newly generated picking Id.
         """
@@ -866,10 +866,10 @@
         move_obj = self.pool.get('stock.move')
         proc_obj = self.pool.get('procurement.order')
         wf_service = netsvc.LocalService("workflow")
-        for production in self.browse(cr, uid, ids):
+        for production in self.browse(cr, uid, ids, context=context):
             if not production.product_lines:
-                self.action_compute(cr, uid, [production.id])
-                production = self.browse(cr, uid, [production.id])[0]
+                self.action_compute(cr, uid, [production.id], context=context)
+                production = self.browse(cr, uid, [production.id], context=context)[0]
             routing_loc = None
             pick_type = 'internal'
             address_id = False
@@ -958,9 +958,9 @@
                     'move_id': move_id,
                     'company_id': production.company_id.id,
                 })
-                wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
+                wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr, context=context)
                 proc_ids.append(proc_id)
-            wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
+            wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr, context=context)
             self.write(cr, uid, [production.id], {'picking_id': picking_id, 'move_lines': [(6,0,moves)], 'state':'confirmed'})
             message = _("Manufacturing order '%s' is scheduled for the %s.") % (
                 production.name,
@@ -969,13 +969,13 @@
             self.log(cr, uid, production.id, message)
         return picking_id
 
-    def force_production(self, cr, uid, ids, *args):
+    def force_production(self, cr, uid, ids, context=None):
         """ Assigns products.
         @param *args: Arguments
         @return: True
         """
         pick_obj = self.pool.get('stock.picking')
-        pick_obj.force_assign(cr, uid, [prod.picking_id.id for prod in self.browse(cr, uid, ids)])
+        pick_obj.force_assign(cr, uid, [prod.picking_id.id for prod in self.browse(cr, uid, ids)], context=context)
         return True
 
 mrp_production()
 
=== modified file 'mrp/procurement.py'
--- mrp/procurement.py	2011-09-17 16:41:25 +0000
+++ mrp/procurement.py	2011-12-13 18:03:48 +0000
@@ -33,7 +33,7 @@
         'property_ids': fields.many2many('mrp.property', 'procurement_property_rel', 'procurement_id','property_id', 'Properties'),
     }
     
-    def check_produce_product(self, cr, uid, procurement, context=[]):
+    def check_produce_product(self, cr, uid, procurement, context=None):
         """ Finds the bill of material for the product from procurement order.
         @return: True or False
         """
@@ -99,7 +99,7 @@
             self.write(cr, uid, [procurement.id], {'state': 'running'})
             bom_result = production_obj.action_compute(cr, uid,
                     [produce_id], properties=[x.id for x in procurement.property_ids])
-            wf_service.trg_validate(uid, 'mrp.production', produce_id, 'button_confirm', cr)
+            wf_service.trg_validate(uid, 'mrp.production', produce_id, 'button_confirm', cr, context=context)
             if res_id:
                 move_obj.write(cr, uid, [res_id],
                         {'location_id': procurement.location_id.id})
 
=== modified file 'mrp_operations/mrp_operations.py'
--- mrp_operations/mrp_operations.py	2011-12-08 09:49:28 +0000
+++ mrp_operations/mrp_operations.py	2011-12-13 18:03:48 +0000
@@ -156,14 +156,14 @@
                     prod_obj.write(cr, uid, [prod.production_id.id], {'date_start':dstart}, context=context, mini=False)
         return result
 
-    def action_draft(self, cr, uid, ids):
+    def action_draft(self, cr, uid, ids, context=None):
         """ Sets state to draft.
         @return: True
         """
         self.write(cr, uid, ids, {'state':'draft'})
         return True
 
-    def action_start_working(self, cr, uid, ids):
+    def action_start_working(self, cr, uid, ids, context=None):
         """ Sets state to start working and writes starting date.
         @return: True
         """
@@ -171,7 +171,7 @@
         self.write(cr, uid, ids, {'state':'startworking', 'date_start': time.strftime('%Y-%m-%d %H:%M:%S')})
         return True
 
-    def action_done(self, cr, uid, ids):
+    def action_done(self, cr, uid, ids, context=None):
         """ Sets state to done, writes finish date and calculates delay.
         @return: True
         """
@@ -188,21 +188,21 @@
         self.modify_production_order_state(cr,uid,ids,'done')
         return True
 
-    def action_cancel(self, cr, uid, ids):
+    def action_cancel(self, cr, uid, ids, context=None):
         """ Sets state to cancel.
         @return: True
         """
         self.write(cr, uid, ids, {'state':'cancel'})
         return True
 
-    def action_pause(self, cr, uid, ids):
+    def action_pause(self, cr, uid, ids, context=None):
         """ Sets state to pause.
         @return: True
         """
         self.write(cr, uid, ids, {'state':'pause'})
         return True
 
-    def action_resume(self, cr, uid, ids):
+    def action_resume(self, cr, uid, ids, context=None):
         """ Sets state to startworking.
         @return: True
         """
@@ -228,7 +228,7 @@
                 result[prod.id] = max(line.date_planned_end, result[prod.id])
         return result
 
-    def action_production_end(self, cr, uid, ids):
+    def action_production_end(self, cr, uid, ids, context=None):
         """ Finishes work order if production order is done.
         @return: Super method
         """
@@ -236,11 +236,11 @@
         wf_service = netsvc.LocalService("workflow")
         for workcenter_line in obj.workcenter_lines:
             if workcenter_line.state == 'draft':
-                wf_service.trg_validate(uid, 'mrp.production.workcenter.line', workcenter_line.id, 'button_start_working', cr)
-            wf_service.trg_validate(uid, 'mrp.production.workcenter.line', workcenter_line.id, 'button_done', cr)
-        return super(mrp_production,self).action_production_end(cr, uid, ids)
+                wf_service.trg_validate(uid, 'mrp.production.workcenter.line', workcenter_line.id, 'button_start_working', cr, context=context)
+            wf_service.trg_validate(uid, 'mrp.production.workcenter.line', workcenter_line.id, 'button_done', cr, context=context)
+        return super(mrp_production,self).action_production_end(cr, uid, ids, context=context)
 
-    def action_in_production(self, cr, uid, ids):
+    def action_in_production(self, cr, uid, ids, context=None):
         """ Changes state to In Production and writes starting date.
         @return: True
         """
@@ -249,8 +249,8 @@
         wf_service = netsvc.LocalService("workflow")
         for prod in self.browse(cr, uid, ids):
             if prod.workcenter_lines:
-                wf_service.trg_validate(uid, 'mrp.production.workcenter.line', prod.workcenter_lines[0].id, 'button_start_working', cr)
-        return super(mrp_production,self).action_in_production(cr, uid, ids)
+                wf_service.trg_validate(uid, 'mrp.production.workcenter.line', prod.workcenter_lines[0].id, 'button_start_working', cr, context=context)
+        return super(mrp_production,self).action_in_production(cr, uid, ids, context=context)
     
     def action_cancel(self, cr, uid, ids, context=None):
         """ Cancels work order if production order is canceled.
@@ -259,7 +259,7 @@
         obj = self.browse(cr, uid, ids,context=context)[0]
         wf_service = netsvc.LocalService("workflow")
         for workcenter_line in obj.workcenter_lines:
-            wf_service.trg_validate(uid, 'mrp.production.workcenter.line', workcenter_line.id, 'button_cancel', cr)
+            wf_service.trg_validate(uid, 'mrp.production.workcenter.line', workcenter_line.id, 'button_cancel', cr, context=context)
         return super(mrp_production,self).action_cancel(cr,uid,ids,context=context)
 
     def _compute_planned_workcenter(self, cr, uid, ids, context=None, mini=False):
@@ -371,13 +371,13 @@
                 pass
         return result
 
-    def action_compute(self, cr, uid, ids, properties=[]):
+    def action_compute(self, cr, uid, ids, properties=[], context=None):
         """ Computes bills of material of a product and planned date of work order.
         @param properties: List containing dictionaries of properties.
         @return: No. of products.
         """
-        result = super(mrp_production, self).action_compute(cr, uid, ids, properties=properties)
-        self._compute_planned_workcenter(cr, uid, ids, context={})
+        result = super(mrp_production, self).action_compute(cr, uid, ids, properties=properties, context=context)
+        self._compute_planned_workcenter(cr, uid, ids, context=context)
         return result
 
 mrp_production()
 
=== modified file 'procurement/procurement.py'
--- procurement/procurement.py	2011-12-07 14:58:54 +0000
+++ procurement/procurement.py	2011-12-13 18:03:48 +0000
@@ -410,7 +410,7 @@
         """
         return 0
 
-    def action_cancel(self, cr, uid, ids):
+    def action_cancel(self, cr, uid, ids, context=None):
         """ Cancels procurement and writes move state to Assigned.
         @return: True
         """
@@ -431,13 +431,13 @@
         self.write(cr, uid, ids, {'state': 'cancel'})
         wf_service = netsvc.LocalService("workflow")
         for id in ids:
-            wf_service.trg_trigger(uid, 'procurement.order', id, cr)
+            wf_service.trg_trigger(uid, 'procurement.order', id, cr, context=context)
         return True
 
-    def action_check_finished(self, cr, uid, ids):
+    def action_check_finished(self, cr, uid, ids, context=None):
         return self.check_move_done(cr, uid, ids)
 
-    def action_check(self, cr, uid, ids):
+    def action_check(self, cr, uid, ids, context=None):
         """ Checks procurement move state whether assigned or done.
         @return: True
         """
@@ -448,14 +448,14 @@
                 ok = True
         return ok
 
-    def action_ready(self, cr, uid, ids):
+    def action_ready(self, cr, uid, ids, context=None):
         """ Changes procurement state to Ready.
         @return: True
         """
         res = self.write(cr, uid, ids, {'state': 'ready'})
         return res
 
-    def action_done(self, cr, uid, ids):
+    def action_done(self, cr, uid, ids, context=None):
         """ Changes procurement state to Done and writes Closed date.
         @return: True
         """
@@ -463,11 +463,11 @@
         for procurement in self.browse(cr, uid, ids):
             if procurement.move_id:
                 if procurement.close_move and (procurement.move_id.state <> 'done'):
-                    move_obj.action_done(cr, uid, [procurement.move_id.id])
+                    move_obj.action_done(cr, uid, [procurement.move_id.id], context=context)
         res = self.write(cr, uid, ids, {'state': 'done', 'date_close': time.strftime('%Y-%m-%d')})
         wf_service = netsvc.LocalService("workflow")
         for id in ids:
-            wf_service.trg_trigger(uid, 'procurement.order', id, cr)
+            wf_service.trg_trigger(uid, 'procurement.order', id, cr, context=context)
         return res
 
 procurement_order()
@@ -475,7 +475,7 @@
 class StockPicking(osv.osv):
     _inherit = 'stock.picking'
 
-    def test_finished(self, cursor, user, ids):
+    def test_finished(self, cursor, user, ids, context=None):
         wf_service = netsvc.LocalService("workflow")
         res = super(StockPicking, self).test_finished(cursor, user, ids)
         for picking in self.browse(cursor, user, ids):
@@ -483,7 +483,7 @@
                 if move.state == 'done' and move.procurements:
                     for procurement in move.procurements:
                         wf_service.trg_validate(user, 'procurement.order',
-                                procurement.id, 'button_check', cursor)
+                                procurement.id, 'button_check', cursor, context=context)
         return res
 
 StockPicking()
 
=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2011-12-01 21:32:12 +0000
+++ purchase/purchase.py	2011-12-13 18:03:48 +0000
@@ -339,15 +339,15 @@
             'account_analytic_id': order_line.account_analytic_id.id or False,
         }
 
-    def action_cancel_draft(self, cr, uid, ids, *args):
+    def action_cancel_draft(self, cr, uid, ids, context=None):
         if not len(ids):
             return False
         self.write(cr, uid, ids, {'state':'draft','shipped':0})
         wf_service = netsvc.LocalService("workflow")
         for p_id in ids:
             # Deleting the existing instance of workflow for PO
-            wf_service.trg_delete(uid, 'purchase.order', p_id, cr)
-            wf_service.trg_create(uid, 'purchase.order', p_id, cr)
+            wf_service.trg_delete(uid, 'purchase.order', p_id, cr, context=context)
+            wf_service.trg_create(uid, 'purchase.order', p_id, cr, context=context)
         for (id,name) in self.name_get(cr, uid, ids):
             message = _("Purchase order '%s' has been set in draft state.") % name
             self.log(cr, uid, id, message)
@@ -421,7 +421,7 @@
             res = inv_id
         return res
 
-    def has_stockable_product(self,cr, uid, ids, *args):
+    def has_stockable_product(self,cr, uid, ids, context=None):
         for order in self.browse(cr, uid, ids):
             for order_line in order.order_line:
                 if order_line.product_id and order_line.product_id.product_tmpl_id.type in ('product', 'consu'):
@@ -437,14 +437,14 @@
                         _('Unable to cancel this purchase order!'),
                         _('You must first cancel all receptions related to this purchase order.'))
             for pick in purchase.picking_ids:
-                wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_cancel', cr)
+                wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_cancel', cr, context=context)
             for inv in purchase.invoice_ids:
                 if inv and inv.state not in ('cancel','draft'):
                     raise osv.except_osv(
                         _('Unable to cancel this purchase order!'),
                         _('You must first cancel all invoices related to this purchase order.'))
                 if inv:
-                    wf_service.trg_validate(uid, 'account.invoice', inv.id, 'invoice_cancel', cr)
+                    wf_service.trg_validate(uid, 'account.invoice', inv.id, 'invoice_cancel', cr, context=context)
         self.write(cr,uid,ids,{'state':'cancel'})
         
         for (id, name) in self.name_get(cr, uid, ids):
@@ -453,7 +453,7 @@
             self.log(cr, uid, id, message)
         return True
 
-    def _prepare_order_picking(self, cr, uid, order, *args):
+    def _prepare_order_picking(self, cr, uid, order, context=None):
         return {
             'name': self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.in'),
             'origin': order.name + ((order.origin and (':' + order.origin)) or ''),
@@ -466,7 +466,7 @@
             'move_lines' : [],
         }
          
-    def _prepare_order_line_move(self, cr, uid, order, order_line, picking_id, *args):
+    def _prepare_order_line_move(self, cr, uid, order, order_line, picking_id, context=None):
         return {
             'name': order.name + ': ' + (order_line.name or ''),
             'product_id': order_line.product_id.id,
@@ -487,7 +487,7 @@
             'price_unit': order_line.price_unit
         }
 
-    def _create_pickings(self, cr, uid, order, order_lines, picking_id=False, *args):
+    def _create_pickings(self, cr, uid, order, order_lines, picking_id=False, context=None):
         """Creates pickings and appropriate stock moves for given order lines, then
         confirms the moves, makes them available, and confirms the picking.
 
@@ -507,7 +507,7 @@
         :return: list of IDs of pickings used/created for the given order lines (usually just one)
         """
         if not picking_id: 
-            picking_id = self.pool.get('stock.picking').create(cr, uid, self._prepare_order_picking(cr, uid, order, *args))
+            picking_id = self.pool.get('stock.picking').create(cr, uid, self._prepare_order_picking(cr, uid, order, context=context))
         todo_moves = []
         stock_move = self.pool.get('stock.move')
         wf_service = netsvc.LocalService("workflow")
@@ -515,19 +515,19 @@
             if not order_line.product_id:
                 continue
             if order_line.product_id.type in ('product', 'consu'):
-                move = stock_move.create(cr, uid, self._prepare_order_line_move(cr, uid, order, order_line, picking_id, *args))
+                move = stock_move.create(cr, uid, self._prepare_order_line_move(cr, uid, order, order_line, picking_id, context=context))
                 if order_line.move_dest_id:
                     order_line.move_dest_id.write({'location_id': order.location_id.id})
                 todo_moves.append(move)
-        stock_move.action_confirm(cr, uid, todo_moves)
-        stock_move.force_assign(cr, uid, todo_moves)
-        wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
+        stock_move.action_confirm(cr, uid, todo_moves, context=context)
+        stock_move.force_assign(cr, uid, todo_moves, context=context)
+        wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr, context=context)
         return [picking_id]
 
-    def action_picking_create(self,cr, uid, ids, *args):
+    def action_picking_create(self,cr, uid, ids, context=None):
         picking_ids = []
         for order in self.browse(cr, uid, ids):
-            picking_ids.extend(self._create_pickings(cr, uid, order, order.order_line, None, *args))
+            picking_ids.extend(self._create_pickings(cr, uid, order, order.order_line, None, context=None))
 
         # Must return one unique picking ID: the one to connect in the subflow of the purchase order.
         # In case of multiple (split) pickings, we should return the ID of the critical one, i.e. the
@@ -730,7 +730,7 @@
     # - split into small internal methods for clearity 
     def product_id_change(self, cr, uid, ids, pricelist, product, qty, uom,
             partner_id, date_order=False, fiscal_position=False, date_planned=False,
-            name=False, price_unit=False, notes=False, context={}):
+            name=False, price_unit=False, notes=False, context=None):
         if not pricelist:
             raise osv.except_osv(_('No Pricelist !'), _('You have to select a pricelist or a supplier in the purchase form !\nPlease set one before choosing a product.'))
         if not  partner_id:
@@ -744,8 +744,9 @@
         lang=False
         if partner_id:
             lang=self.pool.get('res.partner').read(cr, uid, partner_id, ['lang'])['lang']
-        context={'lang':lang}
-        context['partner_id'] = partner_id
+        if context is None:
+            context = {}
+        context = dict(context, lang=lang, partner_id=partner_id)
 
         prod = self.pool.get('product.product').browse(cr, uid, product, context=context)
         prod_uom_po = prod.uom_po_id.id
@@ -805,7 +806,7 @@
     # - merge into 'product_id_change' method
     def product_uom_change(self, cr, uid, ids, pricelist, product, qty, uom,
             partner_id, date_order=False, fiscal_position=False, date_planned=False,
-            name=False, price_unit=False, notes=False, context={}):
+            name=False, price_unit=False, notes=False, context=None):
         res = self.product_id_change(cr, uid, ids, pricelist, product, qty, uom,
                 partner_id, date_order=date_order, fiscal_position=fiscal_position, date_planned=date_planned,
             name=name, price_unit=price_unit, notes=notes, context=context)
 
=== modified file 'sale/sale.py'
--- sale/sale.py	2011-12-11 11:09:56 +0000
+++ sale/sale.py	2011-12-13 18:03:48 +0000
@@ -306,7 +306,7 @@
                 v['pricelist_id'] = shop.pricelist_id.id
         return {'value': v}
 
-    def action_cancel_draft(self, cr, uid, ids, *args):
+    def action_cancel_draft(self, cr, uid, ids, context=None):
         if not len(ids):
             return False
         cr.execute('select id from sale_order_line where order_id IN %s and state=%s', (tuple(ids), 'cancel'))
@@ -316,14 +316,14 @@
         wf_service = netsvc.LocalService("workflow")
         for inv_id in ids:
             # Deleting the existing instance of workflow for SO
-            wf_service.trg_delete(uid, 'sale.order', inv_id, cr)
-            wf_service.trg_create(uid, 'sale.order', inv_id, cr)
+            wf_service.trg_delete(uid, 'sale.order', inv_id, cr, context=context)
+            wf_service.trg_create(uid, 'sale.order', inv_id, cr, context=context)
         for (id,name) in self.name_get(cr, uid, ids):
             message = _("The sales order '%s' has been set in draft state.") %(name,)
             self.log(cr, uid, id, message)
         return True
 
-    def onchange_pricelist_id(self, cr, uid, ids, pricelist_id, order_lines, context={}):
+    def onchange_pricelist_id(self, cr, uid, ids, pricelist_id, order_lines, context=None):
         print order_lines
         if (not pricelist_id) or (not order_lines):
             return {}
@@ -333,6 +333,7 @@
         }
         return {'warning': warning}
 
+<<<<<<< TREE
     def onchange_partner_order_id(self, cr, uid, ids, order_id, invoice_id=False, shipping_id=False, context={}):
         if not order_id:
             return {}
@@ -344,6 +345,9 @@
         return {'value': val}
 
     def onchange_partner_id(self, cr, uid, ids, part):
+=======
+    def onchange_partner_id(self, cr, uid, ids, part, context=None):
+>>>>>>> MERGE-SOURCE
         if not part:
             return {'value': {'partner_invoice_id': False, 'partner_shipping_id': False, 'partner_order_id': False, 'payment_term': False, 'fiscal_position': False}}
 
@@ -608,7 +612,7 @@
                         proc_ids = proc_obj.search(cr, uid, [('move_id', '=', mov.id)])
                         if proc_ids:
                             for proc in proc_ids:
-                                wf_service.trg_validate(uid, 'procurement.order', proc, 'button_check', cr)
+                                wf_service.trg_validate(uid, 'procurement.order', proc, 'button_check', cr, context=context)
             for r in self.read(cr, uid, ids, ['picking_ids']):
                 for pick in r['picking_ids']:
                     wf_service.trg_validate(uid, 'stock.picking', pick, 'button_cancel', cr)
@@ -619,7 +623,7 @@
                         _('You must first cancel all invoices attached to this sales order.'))
             for r in self.read(cr, uid, ids, ['invoice_ids']):
                 for inv in r['invoice_ids']:
-                    wf_service.trg_validate(uid, 'account.invoice', inv, 'invoice_cancel', cr)
+                    wf_service.trg_validate(uid, 'account.invoice', inv, 'invoice_cancel', cr, context=context)
             sale_order_line_obj.write(cr, uid, [l.id for l in  sale.order_line],
                     {'state': 'cancel'})
             message = _("The sales order '%s' has been cancelled.") % (sale.name,)
@@ -627,7 +631,7 @@
         self.write(cr, uid, ids, {'state': 'cancel'})
         return True
 
-    def action_wait(self, cr, uid, ids, *args):
+    def action_wait(self, cr, uid, ids, context=None):
         for o in self.browse(cr, uid, ids):
             if not o.order_line:
                 raise osv.except_osv(_('Error !'),_('You cannot confirm a sale order which has no line.'))
@@ -635,12 +639,12 @@
                 self.write(cr, uid, [o.id], {'state': 'manual', 'date_confirm': time.strftime(DEFAULT_SERVER_DATE_FORMAT)})
             else:
                 self.write(cr, uid, [o.id], {'state': 'progress', 'date_confirm': time.strftime(DEFAULT_SERVER_DATE_FORMAT)})
-            self.pool.get('sale.order.line').button_confirm(cr, uid, [x.id for x in o.order_line])
+            self.pool.get('sale.order.line').button_confirm(cr, uid, [x.id for x in o.order_line], context=context)
             message = _("The quotation '%s' has been converted to a sales order.") % (o.name,)
             self.log(cr, uid, o.id, message)
         return True
 
-    def procurement_lines_get(self, cr, uid, ids, *args):
+    def procurement_lines_get(self, cr, uid, ids, context=None):
         res = []
         for order in self.browse(cr, uid, ids, context={}):
             for line in order.order_line:
@@ -652,14 +656,14 @@
     #   returns True if all lines are done, False otherwise
     # if mode == 'canceled':
     #   returns True if there is at least one canceled line, False otherwise
-    def test_state(self, cr, uid, ids, mode, *args):
+    def test_state(self, cr, uid, ids, mode, context=None):
         assert mode in ('finished', 'canceled'), _("invalid mode for test_state")
         finished = True
         canceled = False
         notcanceled = False
         write_done_ids = []
         write_cancel_ids = []
-        for order in self.browse(cr, uid, ids, context={}):
+        for order in self.browse(cr, uid, ids, context=context):
             for line in order.order_line:
                 if (not line.procurement_id) or (line.procurement_id.state=='done'):
                     if line.state != 'done':
@@ -686,7 +690,7 @@
                 return False
             return canceled
 
-    def _prepare_order_line_procurement(self, cr, uid, order, line, move_id, date_planned, *args):
+    def _prepare_order_line_procurement(self, cr, uid, order, line, move_id, date_planned, context=None):
         return {
             'name': line.name,
             'origin': order.name,
@@ -707,7 +711,7 @@
             'company_id': order.company_id.id,
         }
 
-    def _prepare_order_line_move(self, cr, uid, order, line, picking_id, date_planned, *args):
+    def _prepare_order_line_move(self, cr, uid, order, line, picking_id, date_planned, context=None):
         location_id = order.shop_id.warehouse_id.lot_stock_id.id
         output_id = order.shop_id.warehouse_id.lot_output_id.id
         return {
@@ -734,7 +738,7 @@
             'price_unit': line.product_id.standard_price or 0.0
         }
 
-    def _prepare_order_picking(self, cr, uid, order, *args):
+    def _prepare_order_picking(self, cr, uid, order, context=None):
         pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.out')
         return {
             'name': pick_name,
@@ -750,7 +754,7 @@
             'company_id': order.company_id.id,
         }
 
-    def _create_pickings_and_procurements(self, cr, uid, order, order_lines, picking_id=False, *args):
+    def _create_pickings_and_procurements(self, cr, uid, order, order_lines, picking_id=False, context=None):
         """Create the required procurements to supply sale order lines, also connecting
         the procurements to appropriate stock moves in order to bring the goods to the
         sale order's requested location.
@@ -784,13 +788,13 @@
             if line.product_id:
                 if line.product_id.product_tmpl_id.type in ('product', 'consu'):
                     if not picking_id:
-                        picking_id = picking_obj.create(cr, uid, self._prepare_order_picking(cr, uid, order, *args))
-                    move_id = move_obj.create(cr, uid, self._prepare_order_line_move(cr, uid, order, line, picking_id, date_planned, *args))
+                        picking_id = picking_obj.create(cr, uid, self._prepare_order_picking(cr, uid, order, context=context))
+                    move_id = move_obj.create(cr, uid, self._prepare_order_line_move(cr, uid, order, line, picking_id, date_planned, context=context))
                 else:
                     # a service has no stock move
                     move_id = False
 
-                proc_id = procurement_obj.create(cr, uid, self._prepare_order_line_procurement(cr, uid, order, line, move_id, date_planned, *args))
+                proc_id = procurement_obj.create(cr, uid, self._prepare_order_line_procurement(cr, uid, order, line, move_id, date_planned, context=context))
                 proc_ids.append(proc_id)
                 line.write({'procurement_id': proc_id})
 
@@ -809,10 +813,10 @@
 
         wf_service = netsvc.LocalService("workflow")
         if picking_id:
-            wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
+            wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr, context=context)
 
         for proc_id in proc_ids:
-            wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
+            wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr, context=context)
 
         val = {}
         if order.state == 'shipping_except':
@@ -827,9 +831,9 @@
         order.write(val)
         return True
 
-    def action_ship_create(self, cr, uid, ids, *args):
-        for order in self.browse(cr, uid, ids, context={}):
-            self._create_pickings_and_procurements(cr, uid, order, order.order_line, None, *args)
+    def action_ship_create(self, cr, uid, ids, context=None):
+        for order in self.browse(cr, uid, ids, context=context):
+            self._create_pickings_and_procurements(cr, uid, order, order.order_line, None, context=context)
         return True
 
     def action_ship_end(self, cr, uid, ids, context=None):
@@ -1041,7 +1045,7 @@
         # Trigger workflow events
         wf_service = netsvc.LocalService("workflow")
         for sid in sales.keys():
-            wf_service.trg_write(uid, 'sale.order', sid, cr)
+            wf_service.trg_write(uid, 'sale.order', sid, cr, context=context)
         return create_ids
 
     def button_cancel(self, cr, uid, ids, context=None):
@@ -1065,7 +1069,7 @@
             wf_service.trg_write(uid, 'sale.order', line.order_id.id, cr)
         return res
 
-    def uos_change(self, cr, uid, ids, product_uos, product_uos_qty=0, product_id=None):
+    def uos_change(self, cr, uid, ids, product_uos, product_uos_qty=0, product_id=None, context=None):
         product_obj = self.pool.get('product.product')
         if not product_id:
             return {'value': {'product_uom': product_uos,
 
=== modified file 'stock/stock.py'
--- stock/stock.py	2011-12-01 21:32:12 +0000
+++ stock/stock.py	2011-12-13 18:03:48 +0000
@@ -739,7 +739,7 @@
         # TODO: Check locations to see if in the same location ?
         return True
 
-    def action_assign(self, cr, uid, ids, *args):
+    def action_assign(self, cr, uid, ids, context=None):
         """ Changes state of picking to available if all moves are confirmed.
         @return: True
         """
@@ -750,7 +750,7 @@
             self.pool.get('stock.move').action_assign(cr, uid, move_ids)
         return True
 
-    def force_assign(self, cr, uid, ids, *args):
+    def force_assign(self, cr, uid, ids, context=None):
         """ Changes state of picking to available if moves are confirmed or waiting.
         @return: True
         """
@@ -758,10 +758,10 @@
         for pick in self.browse(cr, uid, ids):
             move_ids = [x.id for x in pick.move_lines if x.state in ['confirmed','waiting']]
             self.pool.get('stock.move').force_assign(cr, uid, move_ids)
-            wf_service.trg_write(uid, 'stock.picking', pick.id, cr)
+            wf_service.trg_write(uid, 'stock.picking', pick.id, cr, context=context)
         return True
 
-    def draft_force_assign(self, cr, uid, ids, *args):
+    def draft_force_assign(self, cr, uid, ids, context=None):
         """ Confirms picking directly from draft state.
         @return: True
         """
@@ -770,7 +770,7 @@
             if not pick.move_lines:
                 raise osv.except_osv(_('Error !'),_('You can not process picking without stock moves'))
             wf_service.trg_validate(uid, 'stock.picking', pick.id,
-                'button_confirm', cr)
+                'button_confirm', cr, context=context)
         return True
 
     def draft_validate(self, cr, uid, ids, context=None):
@@ -782,10 +782,10 @@
         for pick in self.browse(cr, uid, ids, context=context):
             move_ids = [x.id for x in pick.move_lines]
             self.pool.get('stock.move').force_assign(cr, uid, move_ids)
-            wf_service.trg_write(uid, 'stock.picking', pick.id, cr)
+            wf_service.trg_write(uid, 'stock.picking', pick.id, cr, context=context)
         return self.action_process(
             cr, uid, ids, context=context)
-    def cancel_assign(self, cr, uid, ids, *args):
+    def cancel_assign(self, cr, uid, ids, context=None):
         """ Cancels picking and moves.
         @return: True
         """
@@ -793,7 +793,7 @@
         for pick in self.browse(cr, uid, ids):
             move_ids = [x.id for x in pick.move_lines]
             self.pool.get('stock.move').cancel_assign(cr, uid, move_ids)
-            wf_service.trg_write(uid, 'stock.picking', pick.id, cr)
+            wf_service.trg_write(uid, 'stock.picking', pick.id, cr, context=context)
         return True
 
     def action_assign_wkf(self, cr, uid, ids, context=None):
@@ -804,7 +804,7 @@
         self.log_picking(cr, uid, ids, context=context)
         return True
 
-    def test_finished(self, cr, uid, ids):
+    def test_finished(self, cr, uid, ids, context=None):
         """ Tests whether the move is in done or cancel state or not.
         @return: True or False
         """
@@ -818,7 +818,7 @@
                     move.write({'state': 'done'})
         return True
 
-    def test_assigned(self, cr, uid, ids):
+    def test_assigned(self, cr, uid, ids, context=None):
         """ Tests whether the move is in assigned state or not.
         @return: True or False
         """
@@ -1284,16 +1284,16 @@
 
             # At first we confirm the new picking (if necessary)
             if new_picking:
-                wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_confirm', cr)
+                wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_confirm', cr, context=context)
                 # Then we finish the good picking
                 self.write(cr, uid, [pick.id], {'backorder_id': new_picking})
-                self.action_move(cr, uid, [new_picking])
-                wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_done', cr)
-                wf_service.trg_write(uid, 'stock.picking', pick.id, cr)
+                self.action_move(cr, uid, [new_picking], context=context)
+                wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_done', cr, context=context)
+                wf_service.trg_write(uid, 'stock.picking', pick.id, cr, context=context)
                 delivered_pack_id = new_picking
             else:
                 self.action_move(cr, uid, [pick.id])
-                wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_done', cr)
+                wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_done', cr, context=context)
                 delivered_pack_id = pick.id
 
             delivered_pack = self.browse(cr, uid, delivered_pack_id, context=context)
@@ -1909,7 +1909,7 @@
                 })
                 new_moves.append(self.browse(cr, uid, [new_id])[0])
             if pickid:
-                wf_service.trg_validate(uid, 'stock.picking', pickid, 'button_confirm', cr)
+                wf_service.trg_validate(uid, 'stock.picking', pickid, 'button_confirm', cr, context=context)
         if new_moves:
             new_moves += self.create_chained_picking(cr, uid, new_moves, context)
         return new_moves
@@ -1920,10 +1920,10 @@
         """
         moves = self.browse(cr, uid, ids, context=context)
         self.write(cr, uid, ids, {'state': 'confirmed'})
-        self.create_chained_picking(cr, uid, moves, context)
+        self.create_chained_picking(cr, uid, moves, context=context)
         return []
 
-    def action_assign(self, cr, uid, ids, *args):
+    def action_assign(self, cr, uid, ids, context=None):
         """ Changes state to confirmed or waiting.
         @return: List of values
         """
@@ -1931,7 +1931,7 @@
         for move in self.browse(cr, uid, ids):
             if move.state in ('confirmed', 'waiting'):
                 todo.append(move.id)
-        res = self.check_assign(cr, uid, todo)
+        res = self.check_assign(cr, uid, todo, context=context)
         return res
 
     def force_assign(self, cr, uid, ids, context=None):
@@ -2203,10 +2203,10 @@
 
         self.write(cr, uid, move_ids, {'state': 'done', 'date': time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
         for id in move_ids:
-             wf_service.trg_trigger(uid, 'stock.move', id, cr)
+            wf_service.trg_trigger(uid, 'stock.move', id, cr, context=context)
 
         for pick_id in picking_ids:
-            wf_service.trg_write(uid, 'stock.picking', pick_id, cr)
+            wf_service.trg_write(uid, 'stock.picking', pick_id, cr, context=context)
 
         return True
 
 
=== modified file 'stock_location/procurement_pull.py'
--- stock_location/procurement_pull.py	2011-11-24 15:50:58 +0000
+++ stock_location/procurement_pull.py	2011-12-13 18:03:48 +0000
@@ -45,7 +45,7 @@
                     return (line.type_proc=='move') and (line.location_src_id)
         return False
 
-    def action_move_create(self, cr, uid, ids,context=None):
+    def action_move_create(self, cr, uid, ids, context=None):
         proc_obj = self.pool.get('procurement.order')
         move_obj = self.pool.get('stock.move')
         picking_obj=self.pool.get('stock.picking')
@@ -110,15 +110,15 @@
                 'move_id': move_id,
             })
             wf_service = netsvc.LocalService("workflow")
-            wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
-            wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
+            wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr, context=context)
+            wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr, context=context)
             if proc.move_id:
                 move_obj.write(cr, uid, [proc.move_id.id],
                     {'location_id':proc.location_id.id})
             self.write(cr, uid, [proc.id], {'state':'running', 'message':_('Pulled from another location via procurement %d')%proc_id})
 
             # trigger direct processing (the new procurement shares the same planned date as the original one, which is already being processed)
-            wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_check', cr)
+            wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_check', cr, context=context)
         return False
 
 procurement_order()