Merge lp:~hirt/openobject-addons/7.0_oo-calendar_fix_id2real_id into lp:openobject-addons/7.0

[Etienne Hirt]

Fix to avoid that int(base_calendar_id) can return an exception rather than false.

Unmerged revisions

9681. By Etienne Hirt on 2013-12-06

[Fix] avoid exception when converting id2realid in base_calendar

=== modified file 'base_calendar/base_calendar.py'
--- base_calendar/base_calendar.py	2013-09-17 09:39:06 +0000
+++ base_calendar/base_calendar.py	2013-12-06 19:20:37 +0000
@@ -86,7 +86,10 @@
                 return (int(real_id), real_date, end.strftime("%Y-%m-%d %H:%M:%S"))
             return int(real_id)
 
-    return base_calendar_id and int(base_calendar_id) or base_calendar_id
+        return int(base_calendar_id)
+
+    return base_calendar_id
+    
 
 def get_real_ids(ids):
     if isinstance(ids, (str, int, long)):