openerp-community-reviewer team mailing list archive

[Etienne Hirt <hirt@xxxxxxxxxxxxxxxxxxxx>]

Etienne Hirt has proposed merging lp:~hirt/ocb-addons/7.0_calendar_fix_id2real_id into lp:ocb-addons.

Requested reviews:
  Holger Brunn (Therp) (hbrunn)
Related bugs:
  Bug #1258328 in OpenERP Community Backports (Addons): "base_calendar_id2real_id: int(base_calendar_id) can return an exception instead of false"
  https://bugs.launchpad.net/ocb-addons/+bug/1258328

For more details, see:
https://code.launchpad.net/~hirt/ocb-addons/7.0_calendar_fix_id2real_id/+merge/198117

Same as for 6.1-ocb
-- 
https://code.launchpad.net/~hirt/ocb-addons/7.0_calendar_fix_id2real_id/+merge/198117
Your team OpenERP Community Backports Team is subscribed to branch lp:ocb-addons.

=== 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:17:31 +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)):