Merge lp:~yann-papouin/openobject-server/6.1-bug-1172156-bank-format-layout-translation into lp:openobject-server/6.1

Proposed by Yann Papouin
Status: Needs review
Proposed branch: lp:~yann-papouin/openobject-server/6.1-bug-1172156-bank-format-layout-translation
Merge into: lp:openobject-server/6.1
Diff against target: 12 lines (+1/-1)
1 file modified
openerp/addons/base/res/res_bank.py (+1/-1)
To merge this branch: bzr merge lp:~yann-papouin/openobject-server/6.1-bug-1172156-bank-format-layout-translation
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+184944@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

4364. By Yann Papouin

[FIX]format_layout from model res.partner.bank.type must not be translated

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/addons/base/res/res_bank.py'
2--- openerp/addons/base/res/res_bank.py 2012-01-31 13:21:12 +0000
3+++ openerp/addons/base/res/res_bank.py 2013-09-11 07:21:48 +0000
4@@ -62,7 +62,7 @@
5 'name': fields.char('Name', size=64, required=True, translate=True),
6 'code': fields.char('Code', size=64, required=True),
7 'field_ids': fields.one2many('res.partner.bank.type.field', 'bank_type_id', 'Type fields'),
8- 'format_layout': fields.text('Format Layout', translate=True)
9+ 'format_layout': fields.text('Format Layout', translate=False)
10 }
11 _defaults = {
12 'format_layout': lambda *args: "%(bank_name)s: %(acc_number)s"