diff options
| author | Goffin Simon <sig@odoo.com> | 2017-06-09 01:04:21 +0200 |
|---|---|---|
| committer | Goffin Simon <sig@odoo.com> | 2017-06-09 01:04:21 +0200 |
| commit | 6edc0f7e6b4a9f506eceff4c2cda73efdd469ef9 (patch) | |
| tree | 864360183234610d40aa7fee38a94b7237ec26ce | |
| parent | c047b1619cc6cb4acbe8a3a5871b1d4015f3d246 (diff) | |
[FIX] calendar: _get_recurrent_date_by_event
Let's create in google calendar a reccurent event with all day
set and a end date.
When synchronising google calendar with Odoo(by clicking on button
"Sync with Google"). It raised on error because the start date had
a time zone but not the end date(the UNTIL in the rrule).
Fine tuning of 20ed57f
opw:746549
| -rw-r--r-- | addons/calendar/models/calendar.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/calendar/models/calendar.py b/addons/calendar/models/calendar.py index de53a4fd7d9..74f01285343 100644 --- a/addons/calendar/models/calendar.py +++ b/addons/calendar/models/calendar.py @@ -557,7 +557,7 @@ class Meeting(models.Model): if not event_date: event_date = datetime.now() - if self.allday and self.rrule and 'Z' not in self.rrule: + if self.allday and self.rrule and 'UNTIL' in self.rrule and 'Z' not in self.rrule: rset1 = rrule.rrulestr(str(self.rrule), dtstart=event_date.replace(tzinfo=None), forceset=True, ignoretz=True) else: # Convert the event date to saved timezone (or context tz) as it'll |