diff options
| -rw-r--r-- | addons/base_action_rule/base_action_rule.py | 21 | ||||
| -rw-r--r-- | addons/crm/crm_action_rule.py | 1 |
2 files changed, 11 insertions, 11 deletions
diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py index b0fa217e747..79b883c0236 100644 --- a/addons/base_action_rule/base_action_rule.py +++ b/addons/base_action_rule/base_action_rule.py @@ -22,7 +22,8 @@ from datetime import datetime from osv import fields, osv, orm from tools.translate import _ -import mx.DateTime +from datetime import datetime +from datetime import timedelta import pooler import re import time @@ -354,23 +355,23 @@ the rule to mark CC(mail to any other person defined in actions)."), base = False if hasattr(obj, 'create_date') and action.trg_date_type=='create': - base = mx.DateTime.strptime(obj.create_date[:19], '%Y-%m-%d %H:%M:%S') + base = datetime.strptime(obj.create_date[:19], '%Y-%m-%d %H:%M:%S') elif hasattr(obj, 'create_date') and action.trg_date_type=='action_last': if hasattr(obj, 'date_action_last') and obj.date_action_last: - base = mx.DateTime.strptime(obj.date_action_last, '%Y-%m-%d %H:%M:%S') + base = datetime.strptime(obj.date_action_last, '%Y-%m-%d %H:%M:%S') else: - base = mx.DateTime.strptime(obj.create_date[:19], '%Y-%m-%d %H:%M:%S') + base = datetime.strptime(obj.create_date[:19], '%Y-%m-%d %H:%M:%S') elif hasattr(obj, 'date_deadline') and action.trg_date_type=='deadline' \ and obj.date_deadline: - base = mx.DateTime.strptime(obj.date_deadline, '%Y-%m-%d %H:%M:%S') + base = datetime.strptime(obj.date_deadline, '%Y-%m-%d %H:%M:%S') elif hasattr(obj, 'date') and action.trg_date_type=='date' and obj.date: - base = mx.DateTime.strptime(obj.date, '%Y-%m-%d %H:%M:%S') + base = datetime.strptime(obj.date, '%Y-%m-%d %H:%M:%S') if base: 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), + 'minutes': lambda interval: timedelta(minutes=interval), + 'day': lambda interval: timedelta(days=interval), + 'hour': lambda interval: timedelta(hours=interval), + 'month': lambda interval: timedelta(months=interval), } d = base + fnct[action.trg_date_range_type](action.trg_date_range) dt = d.strftime('%Y-%m-%d %H:%M:%S') diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py index 521a183b770..1ca37a426a2 100644 --- a/addons/crm/crm_action_rule.py +++ b/addons/crm/crm_action_rule.py @@ -24,7 +24,6 @@ import re import os import base64 import tools -import mx.DateTime from tools.translate import _ from osv import fields |