Odoo Server (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-server/trunk-opw-578099-port-kbh into lp:openobject-server

  1. trunk-opw-578099-port-kbh
  2. Merge into trunk
Proposed by Khushboo Bhatt(openerp)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-server/trunk-opw-578099-port-kbh
Merge into: lp:openobject-server
Diff against target: 17 lines (+3/-2)
1 file modified
openerp/addons/base/ir/ir_filters.py (+3/-2)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/trunk-opw-578099-port-kbh
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+138418@code.launchpad.net

Description of the change

Hello,

User defined filter name does not translated in user's language. Filter name in
dropdown list should be displayed into the logged in user's language.

Steps to re-produce,
* Create a custom filter and save, open it through 'Manage Filters'
* Click translation flag on name field, add trasnaltion for any language, say French
* Filter name still displays in English in dropdown though we set user's language as French.
Code is forward port from 6.1
Thanks,
Khushboo.

To post a comment you must log in.

Unmerged revisions

4643. By Rifakat Husen (OpenERP)

[FIX]User defined filters name does not get traslated in the user's language while we check them through filter dropdown list

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/addons/base/ir/ir_filters.py'
2--- openerp/addons/base/ir/ir_filters.py 2012-11-08 09:28:22 +0000
3+++ openerp/addons/base/ir/ir_filters.py 2012-12-06 10:59:22 +0000
4@@ -47,10 +47,11 @@
5 ``context`` of the matching ``ir.filters``.
6 """
7 # available filters: private filters (user_id=uid) and public filters (uid=NULL)
8+ context = self.pool.get('res.users').context_get(cr, uid)
9 filter_ids = self.search(cr, uid,
10 [('model_id','=',model),('user_id','in',[uid, False])])
11- my_filters = self.read(cr, uid, filter_ids,
12- ['name', 'is_default', 'domain', 'context', 'user_id'])
13+ my_filters = self.read(cr, uid, filter_ids,
14+ ['name', 'is_default', 'domain', 'context', 'user_id'], context=context)
15 return my_filters
16
17 def _check_global_default(self, cr, uid, vals, matching_filters, context=None):