Merge lp:~openerp-dev/openobject-server/6.0-opw-17522-rha into lp:openobject-server/6.0

Proposed by Rifakat Husen (OpenERP)
Status: Merged
Merged at revision: 3488
Proposed branch: lp:~openerp-dev/openobject-server/6.0-opw-17522-rha
Merge into: lp:openobject-server/6.0
Diff against target: 18 lines (+3/-2)
1 file modified
bin/report/printscreen/ps_list.py (+3/-2)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/6.0-opw-17522-rha
Reviewer Review Type Date Requested Status
Raphael Collet (OpenERP) (community) Approve
Review via email: mp+75308@code.launchpad.net

Description of the change

Hello,

Its a backport of revision 3391.4.1 from trunk, To fix Printscreen report Title not getting translated value. Title does not get translated while changing the language.

Thanks,
Rifakat

To post a comment you must log in.
Revision history for this message
Raphael Collet (OpenERP) (rco-openerp) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/report/printscreen/ps_list.py'
2--- bin/report/printscreen/ps_list.py 2010-10-11 09:37:09 +0000
3+++ bin/report/printscreen/ps_list.py 2011-09-14 07:40:53 +0000
4@@ -68,11 +68,12 @@
5 self.groupby_no_leaf = context.get('group_by_no_leaf',False)
6 pool = pooler.get_pool(cr.dbname)
7 model = pool.get(datas['model'])
8- # Title come from description of model which are specified in py file.
9+ model_id = pool.get('ir.model').search(cr, uid, [('model','=',model._name)])
10 model_desc = model._description
11+ if model_id:
12+ model_desc = pool.get('ir.model').browse(cr, uid, model_id[0], context).name
13 self.title = model_desc
14 datas['ids'] = ids
15- model = pooler.get_pool(cr.dbname).get(datas['model'])
16 result = model.fields_view_get(cr, uid, view_type='tree', context=context)
17 fields_order = self.groupby + self._parse_string(result['arch'])
18 if self.groupby: