[MERGE] merge with parent branch

[odoo/odoo.git] / addons / purchase / purchase.py

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 1f6279a..c7a883f 100644 (file)
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -318,7 +318,7 @@ class purchase_order(osv.osv):
         for po in self.browse(cr, uid, ids, context=context):
             pick_ids += [picking.id for picking in po.picking_ids]
 
-        res = mod_obj.get_object_reference(cr, uid, 'stock', 'view_picking_in_form')
+        res = mod_obj.get_object_reference(cr, uid, 'stock', 'view_picking_form')
         res_id = res and res[1] or False
 
         return {
@@ -347,13 +347,10 @@ class purchase_order(osv.osv):
         template_id = template and template[1] or False
         res = mod_obj.get_object_reference(cr, uid, 'mail', 'email_compose_message_wizard_form')
         res_id = res and res[1] or False
-        ctx = dict(context)
-        ctx.update({
-            'default_model': 'purchase.order',
-            'default_res_id': ids[0],
-            'default_use_template': True,
-            'default_template_id': template_id,
-            })
+        ctx = dict(context, active_model='purchase.order', active_id=ids[0])
+        ctx.update({'mail.compose.template_id': template_id})
+        wf_service = netsvc.LocalService("workflow")
+        wf_service.trg_validate(uid, 'purchase.order',ids[0], 'send_rfq', cr)
         return {
             'view_type': 'form',
             'view_mode': 'form',