From 571e23f3d56c0ff34ef9182de0b1736d4e2f23a9 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Mon, 19 May 2014 12:30:20 +0200 Subject: [PATCH] [FIX] marketing_campaign: server actions always return None or False, and the return value of method _process_wi_action should return True whatever what the server action returns If the server actions returned None instead of False, the next activity was not triggered, while it should --- addons/marketing_campaign/marketing_campaign.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py index d4b05c50127..6a3c4de7f49 100644 --- a/addons/marketing_campaign/marketing_campaign.py +++ b/addons/marketing_campaign/marketing_campaign.py @@ -494,11 +494,9 @@ class marketing_campaign_activity(osv.osv): active_ids=[workitem.res_id], active_model=workitem.object_id.model, workitem=workitem) - res = server_obj.run(cr, uid, [activity.server_action_id.id], + server_obj.run(cr, uid, [activity.server_action_id.id], context=action_context) - # server action return False if the action is performed - # except client_action, other and python code - return res == False and True or res + return True def process(self, cr, uid, act_id, wi_id, context=None): activity = self.browse(cr, uid, act_id, context=context)