Merge lp:~openerp-dev/openobject-addons/trunk-opw-579715-port-mma into lp:openobject-addons

Proposed by Mayur Maheshwari(OpenERP)
Status: Rejected
Rejected by: Fabien (Open ERP)
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-opw-579715-port-mma
Merge into: lp:openobject-addons
Diff against target: 12 lines (+1/-1)
1 file modified
crm/ (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-opw-579715-port-mma
Reviewer Review Type Date Requested Status
Fabien (Open ERP) Disapprove
Review via email:

Description of the change


    In automated action ,state field is not translated in user's language if crm module is installed.
    code is forward port from 6.1


To post a comment you must log in.
Revision history for this message
Fabien (Open ERP) (fp-tinyerp) wrote :

not a clean bug, you should not do _(...) where ... is a dynamix value as the parser will not parse this correctly.

review: Disapprove

Unmerged revisions

8147. By Nehal Panchal (OpenERP)

[FIX]crm: State in automated actions are not translated in user language

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'crm/'
2--- crm/ 2012-11-15 12:38:51 +0000
3+++ crm/ 2012-11-28 07:05:23 +0000
4@@ -87,7 +87,7 @@
5 def state_get(self, cr, uid, context=None):
6 """Gets available states for crm"""
7 res = super(base_action_rule, self).state_get(cr, uid, context=context)
8- return res + crm.AVAILABLE_STATES
9+ return res + [(state[0], _(state[1])) for state in crm.AVAILABLE_STATES]
11 def priority_get(self, cr, uid, context=None):
12 res = super(base_action_rule, self).priority_get(cr, uid, context=context)


People subscribed via source and target branches

to all changes: