Merge lp:~openerp-dev/openobject-server/6.1-opw-578099-rha into lp:openobject-server/6.1

Proposed by Rifakat Husen (OpenERP)
Status: Merged
Approved by: Naresh(OpenERP)
Approved revision: 4262
Merged at revision: 4326
Proposed branch: lp:~openerp-dev/openobject-server/6.1-opw-578099-rha
Merge into: lp:openobject-server/6.1
Diff against target: 14 lines (+2/-1)
1 file modified
openerp/addons/base/ir/ir_filters.py (+2/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/6.1-opw-578099-rha
Reviewer Review Type Date Requested Status
Florent (community) Approve
Naresh(OpenERP) Pending
Review via email: mp+121162@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.

Thanks for your review,
Rifakat Haradwala

To post a comment you must log in.
Revision history for this message
Florent (florent.x) wrote :

LGTM.

Thanks

review: Approve
Revision history for this message
Naresh(OpenERP) (nch-openerp) wrote :

Hello,

This bug was qualified as Confirmed on Trunk (means still existing and reproducible). A Merge Proposal for trunk was created to fix it. Here is the link to follow the MP on Launchpad https://code.launchpad.net/~openerp-dev/openobject-server/trunk-opw-578099-port-kbh/+merge/138418 and be informed once it's been merged in trunk: ... If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

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-02-07 17:59:27 +0000
3+++ openerp/addons/base/ir/ir_filters.py 2012-08-24 11:17:34 +0000
4@@ -39,8 +39,9 @@
5 return super(ir_filters, self).copy(cr, uid, id, default, context)
6
7 def get_filters(self, cr, uid, model):
8+ context = self.pool.get('res.users').context_get(cr, uid)
9 act_ids = self.search(cr,uid,[('model_id','=',model),('user_id','=',uid)])
10- my_acts = self.read(cr, uid, act_ids, ['name', 'domain','context'])
11+ my_acts = self.read(cr, uid, act_ids, ['name', 'domain','context'], context=context)
12 return my_acts
13
14 def create_or_replace(self, cr, uid, vals, context=None):