diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-05-28 14:31:46 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-05-28 14:31:46 +0200 |
| commit | 1f22653d195d2aec1b8b296e3436b1747640dfa4 (patch) | |
| tree | 45c9f1ceb42b8f7ccb1e51186d6cf5bdf02b6035 /addons/note | |
| parent | 92583db004a10b246f1a648a208a296930b084e1 (diff) | |
| parent | fe2b5f35a40ca8df662130608b0f89427a196362 (diff) | |
[MERGE] saas-6 forward-port
Rebasing a merge commit with a lot of conflicts is a real pain as every
non-automatic conflicts should be redo manually (especially when there
is a lot of file rename that git cannot follow)
Diffstat (limited to 'addons/note')
| -rw-r--r-- | addons/note/note.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/note/note.py b/addons/note/note.py index 2db3173a907..fa69b96050e 100644 --- a/addons/note/note.py +++ b/addons/note/note.py @@ -168,7 +168,7 @@ class note_note(osv.osv): return result else: - return super(note_note, self).read_group(self, cr, uid, domain, fields, groupby, + return super(note_note, self).read_group(cr, uid, domain, fields, groupby, offset=offset, limit=limit, context=context, orderby=orderby,lazy=lazy) |