Merge lp:~openerp-dev/openobject-addons/5.0-opw-599251-msh into lp:openobject-addons/5.0

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of crm.case.rule, next action date set wrong, it becomes lesser than last action, it should be atleast >= then last action, also we should execute action if last action is <= then next action because there is possibility that while defining rule user don't give any delay so last action and next action becomes equal, once it becomes equal then other rules will fails to satisy the condition always.

Demo:- Create a new rule in "CRM &amp;
SRM/Configuration/Cases/Rules" with
the values:
Case State : Pending
Trigger Date: Deadline
Set state to: Open
Active :True
Save it.

Now create a new case in " CRM &amp;
SRM/Reporting/All Cases/All Cases"
with a deadline.
For example 17.10.2013
12:30:55
Set the
state to pending and save it
Run

the cron "Check cases rules" before the deadline has passed. The field "Next Action" will be written.
Then run the cron after the deadline has passed. Now the state of the case is open and the field "Last Action" is
higher than "Next Action".
Now Set the state of the case to pending again, set a new deadline that is in the future and save it.
Run the cron again after the new deadline has passed.

Expected result:
The case in state open after the deadline has passed.

Real result:
Nothing changed.

The field "Next Action" will be written only once with the lowest date that the "_action" method can find.
In every run of the cron the condition result in the method "_action" (crm/crm.py:456-465 )   is always false, because the date of the last action is bigger then the next action.

Reason: next action date is not written when rule is executed, so when rule executed also write next action date with delay added, also we should check last_action <= next_action instead of last_action < next_action because there may be no delay at all so next_action and last_action will be the same.

Thanks.

Unmerged revisions

2937. By Mohammed Shekha(OpenERP)<email address hidden> on 2013-11-12

[FIX]CRM: Refixed the issue of crm.case.rule, next action date goes wron, it becomes lesser than last action, it should be atleast >= then last action, also we should execute action if last action is <= then next action because there is possibility that while defining rule user don't give any delay so last action and next action becomes equal, once it becomes equal then other rules will fails to satisy the condition always.

=== modified file 'crm/crm.py'
--- crm/crm.py	2010-07-28 09:29:48 +0000
+++ crm/crm.py	2013-11-13 05:08:28 +0000
@@ -446,19 +446,19 @@
                         base = mx.DateTime.strptime(case.date_deadline, '%Y-%m-%d %H:%M:%S')
                     elif action.trg_date_type=='date' and case.date:
                         base = mx.DateTime.strptime(case.date, '%Y-%m-%d %H:%M:%S')
-                    if base:
-                        fnct = {
+                    fnct = {
                             'minutes': lambda interval: mx.DateTime.RelativeDateTime(minutes=interval),
                             'day': lambda interval: mx.DateTime.RelativeDateTime(days=interval),
                             'hour': lambda interval: mx.DateTime.RelativeDateTime(hours=interval),
                             'month': lambda interval: mx.DateTime.RelativeDateTime(months=interval),
                         }
+                    if base:
                         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 and \
-                                case.date_action_last < case.date_action_next))
+                                case.date_action_last <= case.date_action_next))
                         if not ok:
                             if not case.date_action_next or dt < case.date_action_next:
                                 case.date_action_next = dt
@@ -488,7 +488,10 @@
                                     write['email_cc'] = case.email_cc+','+action.act_email_cc
                             else:
                                 write['email_cc'] = action.act_email_cc
+                        next_date = mx.DateTime.strptime(time.strftime('%Y-%m-%d %H:%M:%S'), '%Y-%m-%d %H:%M:%S') + fnct[action.trg_date_range_type](action.trg_date_range)
+                        next_date = next_date.strftime('%Y-%m-%d %H:%M:%S')
                         write['date_action_last'] = time.strftime('%Y-%m-%d %H:%M:%S')
+                        write['date_action_next'] = next_date
                         self.write(cr, uid, [case.id], write, context)
                         caseobj = self.pool.get('crm.case')
                         if action.act_remind_user: