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

[FIX] base_calendar: add s after day, month, year into relativedelta 

bzr revid: chm@openerp.com-20130910092501-gl9pmd3vk26q32tv
This commit is contained in:
Christophe Matthieu 2013-09-10 11:25:01 +02:00
parent bad1a58eba
commit 1f7f826a90
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/base_calendar/base_calendar.py
View File

@ -1599,16 +1599,14 @@ rule or repeating pattern of time to exclude from the recurring rule."),
if data.get('recurrency') and data.get('end_type') in ('count', unicode('count')):
data_date_deadline = datetime.strptime(data.get('date_deadline'), '%Y-%m-%d %H:%M:%S')
if data.get('rrule_type') in ('daily', unicode('count')):
rel_date = relativedelta(day=data.get('count'))
rel_date = relativedelta(days=data.get('count')+1)
elif data.get('rrule_type') in ('weekly', unicode('weekly')):
rel_date = relativedelta(days=data.get('count')*7)
rel_date = relativedelta(days=(data.get('count')+1)*7)
elif data.get('rrule_type') in ('monthly', unicode('monthly')):
rel_date = relativedelta(month=data.get('count'))
rel_date = relativedelta(months=data.get('count')+1)
elif data.get('rrule_type') in ('yearly', unicode('yearly')):
rel_date = relativedelta(year=data.get('count'))
rel_date = relativedelta(years=data.get('count')+1)
end_date = data_date_deadline + rel_date
# have all virtual date, weekly condition, monthly condition
end_date += relativedelta(month=1)
return end_date
def create(self, cr, uid, vals, context=None):