Odoo Server (MOVED TO GITHUB)

Merge lp:~camptocamp/openobject-server/7.0-propagate-context-1247158 into lp:openobject-server/7.0

  1. 7.0-propagate-context-1247158
  2. Merge into 7.0
Proposed by Guewen Baconnier @ Camptocamp
Status: Merged
Merged at revision: 5194
Proposed branch: lp:~camptocamp/openobject-server/7.0-propagate-context-1247158
Merge into: lp:openobject-server/7.0
Diff against target: 12 lines (+3/-1)
1 file modified
openerp/osv/orm.py (+3/-1)
To merge this branch: bzr merge lp:~camptocamp/openobject-server/7.0-propagate-context-1247158
Reviewer Review Type Date Requested Status
Martin Trigaux (OpenERP) (community) Approve
Review via email: mp+193627@code.launchpad.net

This proposal supersedes a proposal from 2013-11-01.

Description of the change

Fixes lp:1247158

To post a comment you must log in.
lp:~camptocamp/openobject-server/7.0-propagate-context-1247158 updated
5116. By Guewen Baconnier @ Camptocamp

[CHG] set lang to False instead of en_US (already being the default language), reducing the places where this default value is set

Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

Set language to False as proposed in https://bugs.launchpad.net/openobject-server/+bug/1247158/comments/1

Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

Hmm this MP has been proposed again by OPW here https://code.launchpad.net/~openerp-dev/openobject-server/7.0-opw-600285-msh/+merge/200034, so I close it.

Revision history for this message
Martin Trigaux (OpenERP) (mat-openerp) wrote :

A bit of redundancy for this bug :)
I have merged the code into 7, thanks

revno: 5194 [merge]
revision-id: <email address hidden>

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/osv/orm.py'
2--- openerp/osv/orm.py 2013-12-10 14:03:30 +0000
3+++ openerp/osv/orm.py 2013-12-28 20:38:55 +0000
4@@ -4180,7 +4180,9 @@
5 if not src_trans:
6 src_trans = vals[f]
7 # Inserting value to DB
8- self.write(cr, user, ids, {f: vals[f]})
9+ ctx = context.copy()
10+ ctx['lang'] = False
11+ self.write(cr, user, ids, {f: vals[f]}, context=ctx)
12 self.pool.get('ir.translation')._set_ids(cr, user, self._name+','+f, 'model', context['lang'], ids, vals[f], src_trans)
13
14