From 1f7f826a90b8fabcd09bfdc0ff0233719daf5a6a Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 10 Sep 2013 11:25:01 +0200 Subject: [PATCH] [FIX] base_calendar: add s after day, month, year into relativedelta bzr revid: chm@openerp.com-20130910092501-gl9pmd3vk26q32tv --- addons/base_calendar/base_calendar.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index b8768e59c3a..c5a16931323 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -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):