Merge lp:~camptocamp/openobject-addons/7.0-fix_action_rule_processing_lp1190592-afe into lp:openobject-addons/7.0

[Alexandre Fayolle - camptocamp]

Fix base.action.rule is repeated ignoring the date it was last run (lp:1190592)

I think this fix is more readable than the version proposed in https://code.launchpad.net/~elbati/openobject-addons/7.0_fix_action_rule_processing/+merge/169191

[Leonardo Pistone (lepistone)]

Thanks Alexandre,

I completely agree with you the original one-liner is unreadable (I remember spending a while to figure it out at the time).

The reason for the old proposal was to just fix the bug, without trying to improve the code.

So if it were new code, I'd be 100% approve, for a fix like that I don't know.

review: Abstain (code review)

[Leonardo Pistone (lepistone)]

...but your fix is good so no reason to block this. Thanks!

review: Approve (code review)

Unmerged revisions

9860. By Alexandre Fayolle - camptocamp on 2014-03-03

[FIX] base.action.rule is repeated ignoring the date it was last run

=== modified file 'base_action_rule/base_action_rule.py'
--- base_action_rule/base_action_rule.py	2014-02-12 11:39:24 +0000
+++ base_action_rule/base_action_rule.py	2014-03-03 14:40:55 +0000
@@ -266,7 +266,12 @@
                 if not record_dt:
                     continue
                 action_dt = get_datetime(record_dt) + delay
-                if last_run and (last_run <= action_dt < now) or (action_dt < now):
+                if last_run: # don't try to put everything in a one-liner or
+                             # risk being bitten by lp:1190592
+                    needs_process = (last_run <= action_dt < now)
+                else:
+                    needs_process = (action_dt < now)
+                if needs_process:
                     try:
                         self._process(cr, uid, action, [record.id], context=context)
                     except Exception: