Merge lp:~yann-papouin/ocb-server/6.1-bug-1247158-propagate-context into lp:ocb-server/6.1

Proposed by Yann Papouin
Status: Merged
Merged at revision: 4329
Proposed branch: lp:~yann-papouin/ocb-server/6.1-bug-1247158-propagate-context
Merge into: lp:ocb-server/6.1
Diff against target: 11 lines (+2/-1)
1 file modified
openerp/osv/orm.py (+2/-1)
To merge this branch: bzr merge lp:~yann-papouin/ocb-server/6.1-bug-1247158-propagate-context
Reviewer Review Type Date Requested Status
Stefan Rijnhart (Opener) Approve
Paulius Sladkevičius @ hbee (community) code review Approve
Holger Brunn (Therp) code review Approve
Review via email: mp+204271@code.launchpad.net

Description of the change

Backport from 7.0

To post a comment you must log in.
Revision history for this message
Holger Brunn (Therp) (hbrunn) :
review: Approve (code review)
Revision history for this message
Paulius Sladkevičius @ hbee (komsas) :
review: Approve (code review)
Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote :

Thanks! Code is still verbatim in Odoo 8.0 (only now in models.py)

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-10-08 13:16:15 +0000
3+++ openerp/osv/orm.py 2014-01-31 15:53:13 +0000
4@@ -3943,7 +3943,8 @@
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+ context_wo_lang = dict(context, lang=None)
10+ self.write(cr, user, ids, {f: vals[f]}, context=context_wo_lang)
11 self.pool.get('ir.translation')._set_ids(cr, user, self._name+','+f, 'model', context['lang'], ids, vals[f], src_trans)
12
13

Subscribers

People subscribed via source and target branches

to status/vote changes: