odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Wrap long lines and remove trailing whitespace. 

bzr revid: daniel.watkins@credativ.co.uk-20100909142708-j16gpfvsxrh6qwno
This commit is contained in:
Daniel Watkins (credativ) 2010-09-09 15:27:08 +01:00
parent a298287a8c
commit 350887d5ab
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
addons/base_action_rule/base_action_rule.py
View File

@ -229,28 +229,33 @@ the rule to mark CC(mail to any other person defined in actions)."),
base = False
if rule.trg_date_type=='create' and hasattr(obj, 'create_date'):
base = obj.create_date
elif rule.trg_date_type=='action_last' and hasattr(obj, 'create_date'):
elif (rule.trg_date_type=='action_last'
and hasattr(obj, 'create_date')):
if hasattr(obj, 'date_action_last') and obj.date_action_last:
base = obj.date_action_last
else:
base = obj.create_date
elif rule.trg_date_type=='deadline' and hasattr(obj, 'date_deadline') \
and obj.date_deadline:
elif (rule.trg_date_type=='deadline'
and hasattr(obj, 'date_deadline')
and obj.date_deadline):
base = obj.date_deadline
elif rule.trg_date_type=='date' and hasattr(obj, 'date') and obj.date:
elif (rule.trg_date_type=='date'
and hasattr(obj, 'date')
and obj.date):
base = obj.date
if base:
fnct = {
'minutes': lambda interval: timedelta(minutes=interval),
'day': lambda interval: timedelta(days=interval),
'hour': lambda interval: timedelta(hours=interval),
'month': lambda interval: timedelta(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),
}
base = get_datetime(base)
d = base + fnct[rule.trg_date_range_type](rule.trg_date_range)
if (not last_run or (last_run <= d < now)):
self._action(cr, uid, [rule.id], [obj], context=context)
rule_pool.write(cr, uid, [rule.id], {'last_run': now}, context=context)
rule_pool.write(cr, uid, [rule.id], {'last_run': now},
context=context)
def format_body(self, body):
""" Foramat Action rule's body