Make action date calculation clearer.

bzr revid: daniel.watkins@credativ.co.uk-20100909142809-nrbt7f6sx3e86bxp
2010-09-09 15:28:09 +01:00
parent 350887d5ab
commit a53aeb5c0d
1 changed files with 3 additions and 2 deletions
@@ -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)