[FIX] opw 50985

bzr revid: olt@tinyerp.com-20120202130135-znzd2vrqsuk3o0r9

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index a52093b..3863d32 100644 (file)
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1549,8 +1549,11 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
             res = super(calendar_event, self).read(cr, uid, real_id, fields=fields, context=context, load=load)
             if not res :
                 continue
+
             ls = base_calendar_id2real_id(base_calendar_id, with_date=res and res.get('duration', 0) or 0)
-            if not isinstance(ls, (str, int, long)) and len(ls) >= 2:
+            # if it's a recurring event, we get the dates the the vrtual id
+            # (which is buggy btw but at least it will work with normal events):
+            if not isinstance(ls, (str, int, long)) and len(ls) >= 2 and res.get('recurrency'):
                 res['date'] = ls[1]
                 res['date_deadline'] = ls[2]
             res['id'] = base_calendar_id