pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] base_calendar: when searching on events, avoid getting an error if virtual_id=False and count=True

Browse Source 
bzr revid: mat@openerp.com-20140116094758-y32i7bw4zpakk92z
This commit is contained in:
Martin Trigaux
2014-01-16 10:47:58 +01:00
parent f39b8bb436
commit c02f16e443
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/base_calendar/base_calendar.py
+6 -6
View File
@@ -1413,12 +1413,12 @@ rule or repeating pattern of time to exclude from the recurring rule."),
new_id = get_real_ids(arg[2])
new_arg = (arg[0], arg[1], new_id)
new_args.append(new_arg)
if context.get('virtual_id', True):
#offset, limit, order and count must be treated separately as we may need to deal with virtual ids
res = super(calendar_event, self).search(cr, uid, new_args, offset=0, limit=0, order=None, context=context, count=False)
res = self._get_recurrent_ids(cr, uid, res, args, limit, order=order, context=context)
else:
res = super(calendar_event, self).search(cr, uid, new_args, offset=offset, limit=limit, order=order, context=context, count=count)
if not context.get('virtual_id', True):
return super(calendar_event, self).search(cr, uid, new_args, offset=offset, limit=limit, order=order, context=context, count=count)
# offset, limit, order and count must be treated separately as we may need to deal with virtual ids
res = super(calendar_event, self).search(cr, uid, new_args, offset=0, limit=0, order=None, context=context, count=False)
res = self._get_recurrent_ids(cr, uid, res, args, limit, order=order, context=context)
if count:
return len(res)