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

[Yann Papouin]

Backport from 7.0

[Holger Brunn (Therp) (hbrunn)]

review: Approve (code review)

[Paulius Sladkevičius @ hbee (komsas)]

review: Approve (code review)

[Stefan Rijnhart (Opener) (stefan-opener)]

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

review: Approve

=== modified file 'openerp/osv/orm.py'
--- openerp/osv/orm.py	2013-10-08 13:16:15 +0000
+++ openerp/osv/orm.py	2014-01-31 15:53:13 +0000
@@ -3943,7 +3943,8 @@
                         if not src_trans:
                             src_trans = vals[f]
                             # Inserting value to DB
-                            self.write(cr, user, ids, {f: vals[f]})
+                            context_wo_lang = dict(context, lang=None)
+                            self.write(cr, user, ids, {f: vals[f]}, context=context_wo_lang)
                         self.pool.get('ir.translation')._set_ids(cr, user, self._name+','+f, 'model', context['lang'], ids, vals[f], src_trans)