diff options
| author | Denis Ledoux <dle@openerp.com> | 2014-04-17 13:04:35 +0200 |
|---|---|---|
| committer | Denis Ledoux <dle@openerp.com> | 2014-04-17 13:04:35 +0200 |
| commit | a103ff4ebc5d1da1337c76bf637f39a1c3733d39 (patch) | |
| tree | 87992404ce4e95a92664a8adad5cd08933e7fa38 /addons/note/note.py | |
| parent | 7c668d8eac0f5c8ffddc7c6836e45ab821768d26 (diff) | |
[FIX] note: folded by default was not considered
bzr revid: dle@openerp.com-20140417110435-u8uwwcf5ji1b54ao
Diffstat (limited to 'addons/note/note.py')
| -rw-r--r-- | addons/note/note.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/addons/note/note.py b/addons/note/note.py index 00c67c37191..3e419888c28 100644 --- a/addons/note/note.py +++ b/addons/note/note.py @@ -128,16 +128,15 @@ class note_note(osv.osv): current_stage_ids = self.pool.get('note.stage').search(cr,uid,[('user_id','=',uid)], context=context) if current_stage_ids: #if the user have some stages - - #dict of stages: map les ids sur les noms - stage_name = dict(self.pool.get('note.stage').name_get(cr, uid, current_stage_ids, context=context)) + stages = self.pool['note.stage'].browse(cr, uid, current_stage_ids, context=context) result = [{ #notes by stage for stages user '__context': {'group_by': groupby[1:]}, - '__domain': domain + [('stage_ids.id', '=', current_stage_id)], - 'stage_id': (current_stage_id, stage_name[current_stage_id]), - 'stage_id_count': self.search(cr,uid, domain+[('stage_ids', '=', current_stage_id)], context=context, count=True) - } for current_stage_id in current_stage_ids] + '__domain': domain + [('stage_ids.id', '=', stage.id)], + 'stage_id': (stage.id, stage.name), + 'stage_id_count': self.search(cr,uid, domain+[('stage_ids', '=', stage.id)], context=context, count=True), + '__fold': stage.fold, + } for stage in stages] #note without user's stage nb_notes_ws = self.search(cr,uid, domain+[('stage_ids', 'not in', current_stage_ids)], context=context, count=True) @@ -153,8 +152,9 @@ class note_note(osv.osv): result = [{ '__context': {'group_by': groupby[1:]}, '__domain': domain + [dom_not_in], - 'stage_id': (current_stage_ids[0], stage_name[current_stage_ids[0]]), - 'stage_id_count':nb_notes_ws + 'stage_id': (stages[0].id, stages[0].name), + 'stage_id_count':nb_notes_ws, + '__fold': stages[0].name, }] + result else: # if stage_ids is empty |