Merge lp:~hirt/ocb-addons/6.1_calendar_fix_id2real_id into lp:ocb-addons/6.1

[Etienne Hirt]

[7], [6.1] Fix to avoid that int(base_calendar_id) can return an exception rather than false.

This fix is for bot 7 and 6.1 branch. But prepared on 6.1

[Holger Brunn (Therp) (hbrunn)]

But please also propose the same for 7.0 in order not to introduce regressions in the ocb branches

review: Approve (code review)

[Holger Brunn (Therp) (hbrunn)]

Oh, and please also link the MP to a bug report

[Pedro Manuel Baeza (pedro.baeza)]

Thanks for the patch.

Regards.

review: Approve

[Yann Papouin (yann-papouin)]

review: Approve

=== modified file 'base_calendar/base_calendar.py'
--- base_calendar/base_calendar.py	2012-03-05 14:35:54 +0000
+++ base_calendar/base_calendar.py	2013-11-06 07:21:57 +0000
@@ -85,7 +85,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 real_id2base_calendar_id(real_id, recurrent_date):
     """