From 3d70e2c76ce648d592188912e65eb04fe80ae893 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Wed, 9 Apr 2014 12:30:45 +0200 Subject: [PATCH 1/3] [FIX] add the 'lazy' parameter to the horrible inherited read_group method in account report entries (addon account) bzr revid: ged@openerp.com-20140409103045-d4401h586il3x0ii --- addons/account/report/account_entries_report.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/report/account_entries_report.py b/addons/account/report/account_entries_report.py index 6060d97c182..df2d92c9f12 100644 --- a/addons/account/report/account_entries_report.py +++ b/addons/account/report/account_entries_report.py @@ -94,7 +94,7 @@ class account_entries_report(osv.osv): return super(account_entries_report, self).search(cr, uid, args=args, offset=offset, limit=limit, order=order, context=context, count=count) - def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None, orderby=False): + def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None, orderby=False,lazy=True): if context is None: context = {} fiscalyear_obj = self.pool.get('account.fiscalyear') @@ -108,7 +108,7 @@ class account_entries_report(osv.osv): domain.append(['period_id','in',ids]) else: domain = domain - return super(account_entries_report, self).read_group(cr, uid, domain, fields, groupby, offset, limit, context, orderby) + return super(account_entries_report, self).read_group(cr, uid, domain, fields, groupby, offset, limit, context, orderby,lazy) def init(self, cr): tools.drop_view_if_exists(cr, 'account_entries_report') From 811456f35e0df0b3f4437d7c08e8f5db1398583e Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Wed, 9 Apr 2014 12:42:30 +0200 Subject: [PATCH 2/3] [FIX] add the new 'lazy' keyword argument to the read_group calls inherited in several models (addons calendar, idea, note) bzr revid: ged@openerp.com-20140409104230-5v0p49ij1wd87qhc --- addons/calendar/calendar.py | 4 ++-- addons/idea/models/idea.py | 4 ++-- addons/note/note.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/calendar/calendar.py b/addons/calendar/calendar.py index e928432821b..ecdfdec669f 100644 --- a/addons/calendar/calendar.py +++ b/addons/calendar/calendar.py @@ -1476,7 +1476,7 @@ class calendar_event(osv.Model): self.create_attendees(cr, uid, [res], context=context) return res - def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None, orderby=False): + def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None, orderby=False, lazy=True): if not context: context = {} @@ -1484,7 +1484,7 @@ class calendar_event(osv.Model): raise osv.except_osv(_('Warning!'), _('Group by date is not supported, use the calendar view instead.')) virtual_id = context.get('virtual_id', True) context.update({'virtual_id': False}) - res = super(calendar_event, self).read_group(cr, uid, domain, fields, groupby, offset=offset, limit=limit, context=context, orderby=orderby) + res = super(calendar_event, self).read_group(cr, uid, domain, fields, groupby, offset=offset, limit=limit, context=context, orderby=orderby, lazy) for result in res: #remove the count, since the value is not consistent with the result of the search when expand the group for groupname in groupby: diff --git a/addons/idea/models/idea.py b/addons/idea/models/idea.py index 61934cfc3b2..ba393324fec 100644 --- a/addons/idea/models/idea.py +++ b/addons/idea/models/idea.py @@ -91,7 +91,7 @@ class IdeaIdea(osv.Model): # Technical stuff #------------------------------------------------------ - def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None, orderby=False): + def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None, orderby=False, lazy=True): """ Override read_group to always display all states. """ if groupby and groupby[0] == "state": # Default result structure @@ -103,7 +103,7 @@ class IdeaIdea(osv.Model): 'state_count': 0, } for state_value, state_name in states] # Get standard results - read_group_res = super(IdeaIdea, self).read_group(cr, uid, domain, fields, groupby, offset, limit, context, orderby) + read_group_res = super(IdeaIdea, self).read_group(cr, uid, domain, fields, groupby, offset, limit, context, orderby, lazy) # Update standard results with default results result = [] for state_value, state_name in states: diff --git a/addons/note/note.py b/addons/note/note.py index 7f03f43b36a..38b2395a852 100644 --- a/addons/note/note.py +++ b/addons/note/note.py @@ -116,7 +116,7 @@ class note_note(osv.osv): } _order = 'sequence' - def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None, orderby=False): + def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None, orderby=False, lazy=True): if groupby and groupby[0]=="stage_id": #search all stages @@ -169,7 +169,7 @@ class note_note(osv.osv): else: return super(note_note, self).read_group(self, cr, uid, domain, fields, groupby, - offset=offset, limit=limit, context=context, orderby=orderby) + offset=offset, limit=limit, context=context, orderby=orderby,lazy=lazy) #upgrade config setting page to configure pad, fancy and tags mode From 27dab11ccda0b1e949b3bbc8cec77a5b2a510b0a Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Wed, 9 Apr 2014 12:51:27 +0200 Subject: [PATCH 3/3] [FIX] fix to the previous fix: it should correctly calls the readgroup methods now (addons calendar, idea) bzr revid: ged@openerp.com-20140409105127-ctn9bl6h5gd62x0x --- addons/calendar/calendar.py | 2 +- addons/idea/models/idea.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/calendar/calendar.py b/addons/calendar/calendar.py index ecdfdec669f..add0030d76c 100644 --- a/addons/calendar/calendar.py +++ b/addons/calendar/calendar.py @@ -1484,7 +1484,7 @@ class calendar_event(osv.Model): raise osv.except_osv(_('Warning!'), _('Group by date is not supported, use the calendar view instead.')) virtual_id = context.get('virtual_id', True) context.update({'virtual_id': False}) - res = super(calendar_event, self).read_group(cr, uid, domain, fields, groupby, offset=offset, limit=limit, context=context, orderby=orderby, lazy) + res = super(calendar_event, self).read_group(cr, uid, domain, fields, groupby, offset=offset, limit=limit, context=context, orderby=orderby, lazy=lazy) for result in res: #remove the count, since the value is not consistent with the result of the search when expand the group for groupname in groupby: diff --git a/addons/idea/models/idea.py b/addons/idea/models/idea.py index ba393324fec..37fbbe82e1c 100644 --- a/addons/idea/models/idea.py +++ b/addons/idea/models/idea.py @@ -114,7 +114,7 @@ class IdeaIdea(osv.Model): result.append(res[0]) return result else: - return super(IdeaIdea, self).read_group(cr, uid, domain, fields, groupby, offset=offset, limit=limit, context=context, orderby=orderby) + return super(IdeaIdea, self).read_group(cr, uid, domain, fields, groupby, offset=offset, limit=limit, context=context, orderby=orderby, lazy=lazy) #------------------------------------------------------ # Workflow / Actions