Merge lp:~openerp-dev/openobject-addons/7.0-opw-597154-chandni into lp:openobject-addons/7.0

[Chandni Machchhar(OpenERP)]

Hello,

I have fix the Traceback when you click on Messaging > Organizer > Calendar, Click on form view without any record. It will give you Traceback.

Thanks,
Chandni.

Unmerged revisions

9412. By Chandni Machchhar(OpenERP) on 2013-09-05

[FIX] Traceback when open form view without any record in Messaging > Organizer > Calendar.

=== modified file 'base_calendar/base_calendar.py'
--- base_calendar/base_calendar.py	2013-09-02 08:27:42 +0000
+++ base_calendar/base_calendar.py	2013-09-06 05:28:26 +0000
@@ -1486,14 +1486,15 @@
         real_data = dict(zip([x['id'] for x in real_data], real_data))
 
         for base_calendar_id, real_id in select:
-            res = real_data[real_id].copy()
-            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:
-                res['date'] = ls[1]
-                res['date_deadline'] = ls[2]
-            res['id'] = base_calendar_id
+            if base_calendar_id and real_id:
+                res = real_data[real_id].copy()
+                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:
+                    res['date'] = ls[1]
+                    res['date_deadline'] = ls[2]
+                res['id'] = base_calendar_id
 
-            result.append(res)
+                result.append(res)
 
         for r in result:
             if r['user_id']: