From 0f03d60fdf6a48b1188bbcfb17fb01c17e1c420d Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Fri, 2 Jul 2010 10:57:19 +0200 Subject: [PATCH] [FIX] marketing_campaign: auto transitions are also directly processed in manual mode bzr revid: chs@openerp.com-20100702085719-isca5a7nmwa0j31i --- addons/marketing_campaign/marketing_campaign.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py index ad48622bd27..3261d58686b 100644 --- a/addons/marketing_campaign/marketing_campaign.py +++ b/addons/marketing_campaign/marketing_campaign.py @@ -587,13 +587,12 @@ class marketing_campaign_workitem(osv.osv): # test test_realtime manual normal (active) # time Y N N N # signal N N N N - # auto Y Y N Y + # auto Y Y Y Y # - run = False - if transition.trigger != 'signal' and campaign_mode != 'manual': - if transition.trigger == 'auto' or campaign_mode == 'test': - run = True + run = transition.trigger == 'auto' \ + or (transition.trigger == 'time' \ + and campaign_mode == 'test') if run: new_wi = self.browse(cr, uid, wi_id, context) self._process_one(cr, uid, new_wi, context)