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

[Alexandre Fayolle - camptocamp]

fix issue with action being erroneously repeated.

Port of https://code.launchpad.net/~camptocamp/openobject-addons/7.0-fix_action_rule_processing_lp1190592-afe/+merge/209077

Note that there is another MP on openobject-addons for this bug, which I personnaly find less clear (https://code.launchpad.net/~elbati/openobject-addons/7.0_fix_action_rule_processing/+merge/169191). If people think that the latter is better, just say so in the reviews and I'll update the ocb MP accordingly.

[Pedro Manuel Baeza (pedro.baeza)]

Indeed, a misuse of the one line sentences.

Regards.

review: Approve (code review)

[Holger Brunn (Therp) (hbrunn)]

what we want is

if last_run and (last_run <= action_dt < now) or not last_run and (action_dt < now):

review: Approve (code review)

[Leonardo Pistone (lepistone)]

review: Approve (code review)

[Yann Papouin (yann-papouin)]

This one is better to understand

review: Approve (code review)

=== 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 15:24:04 +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: