Etienne Hirt has proposed merging lp:~hirt/ocb-addons/6.1_calendar_fix_id2real_id into lp:ocb-addons/6.1.
Requested reviews: OpenERP Community Backports Team (ocb) For more details, see: https://code.launchpad.net/~hirt/ocb-addons/6.1_calendar_fix_id2real_id/+merge/194070 [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 -- https://code.launchpad.net/~hirt/ocb-addons/6.1_calendar_fix_id2real_id/+merge/194070 Your team OpenERP Community Backports Team is requested to review the proposed merge of lp:~hirt/ocb-addons/6.1_calendar_fix_id2real_id into lp:ocb-addons/6.1.
=== 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): """
-- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp