From 08e5155f2cf0f502ad74afdecb25bd4534088ace Mon Sep 17 00:00:00 2001 From: ced <> Date: Wed, 10 Oct 2007 13:32:42 +0000 Subject: [PATCH] Fix crm rules that use the creation date bzr revid: ced-8e4e47c8090afd41969bcf594b3f826b503bc4ff --- addons/crm/crm.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 516bdd2f245..da55afc2fa4 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -332,9 +332,12 @@ class crm_case(osv.osv): } d = base + fnct[action.trg_date_range_type](action.trg_date_range) dt = d.strftime('%Y-%m-%d %H:%M:%S') - ok = (dt <= time.strftime('%Y-%m-%d %H:%M:%S')) and ((not case.date_action_next) or dt>case.date_action_next) + ok = (dt <= time.strftime('%Y-%m-%d %H:%M:%S')) and \ + ((not case.date_action_next) or \ + (dt >= case.date_action_next and \ + case.date_action_last < case.date_action_next)) if not ok: - if not case.date_action_next or dt