From a53aeb5c0d7d7d5ec462f2cb709c616476945d07 Mon Sep 17 00:00:00 2001 From: "Daniel Watkins (credativ)" Date: Thu, 9 Sep 2010 15:28:09 +0100 Subject: [PATCH] Make action date calculation clearer. bzr revid: daniel.watkins@credativ.co.uk-20100909142809-nrbt7f6sx3e86bxp --- addons/base_action_rule/base_action_rule.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py index 0e564915c7c..630cfca7e49 100644 --- a/addons/base_action_rule/base_action_rule.py +++ b/addons/base_action_rule/base_action_rule.py @@ -251,8 +251,9 @@ the rule to mark CC(mail to any other person defined in actions)."), 'month': lambda interval: timedelta(months=interval), } base = get_datetime(base) - d = base + fnct[rule.trg_date_range_type](rule.trg_date_range) - if (not last_run or (last_run <= d < now)): + delay = fnct[rule.trg_date_range_type](rule.trg_date_range) + action_date = base + delay + if (not last_run or (last_run <= action_date < now)): self._action(cr, uid, [rule.id], [obj], context=context) rule_pool.write(cr, uid, [rule.id], {'last_run': now}, context=context)