odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[REVERT] revert previous commit: this specific case was legit 

bzr revid: chs@openerp.com-20140311163833-evzfw1z6fl8m63in
This commit is contained in:
Christophe Simonis 2014-03-11 17:38:33 +01:00
parent 9dc0859c77
commit 8a8f93a101
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/calendar/calendar.py
View File

@ -1326,8 +1326,8 @@ class calendar_event(osv.Model):
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=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, order=order, context=context)
if count:
return len(res)