[tryton-debian-vcs] tryton-server branch upstream-3.4 updated. upstream/3.4.14-1-gf391fe9

[Mathias Behrle]

The following commit has been merged in the upstream-3.4 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-server.git;a=commitdiff;h=upstream/3.4.14-1-gf391fe9

commit f391fe9170faec14751df06c9dcb7c72a21e13b6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Dec 19 11:26:50 2016 +0100

    Adding upstream version 3.4.15.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index f8a5d3b..b9dfbe7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.15 - 2016-12-17
+* Bug fixes (see mercurial logs for details)
+
 Version 3.4.14 - 2016-08-30
 * Bug fixes (see mercurial logs for details)
 * Sanitize path in file_open (CVE-2016-1242)
diff --git a/PKG-INFO b/PKG-INFO
index 96c5b05..4b5ee69 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 3.4.14
+Version: 3.4.15
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond.egg-info/PKG-INFO b/trytond.egg-info/PKG-INFO
index 96c5b05..4b5ee69 100644
--- a/trytond.egg-info/PKG-INFO
+++ b/trytond.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 3.4.14
+Version: 3.4.15
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond/ir/translation.py b/trytond/ir/translation.py
index b0c8a54..b794212 100644
--- a/trytond/ir/translation.py
+++ b/trytond/ir/translation.py
@@ -934,7 +934,7 @@ class Translation(ModelSQL, ModelView):
                     and translation.overriding_module != module):
                 cls.raise_user_error('translation_overridden', {
                         'name': translation.name,
-                        'name': translation.overriding_module,
+                        'overriding_module': translation.overriding_module,
                         })
             flags = [] if not translation.fuzzy else ['fuzzy']
             trans_ctxt = '%(type)s:%(name)s:' % {
diff --git a/trytond/res/user.py b/trytond/res/user.py
index f7dd7e2..c79a877 100644
--- a/trytond/res/user.py
+++ b/trytond/res/user.py
@@ -395,7 +395,13 @@ class User(ModelSQL, ModelView):
                     values_clean['language'] = langs[0].id
                 else:
                     del values_clean['language']
-        cls.write([user], values_clean)
+        # Set new context to write as validation could depend on it
+        context = {}
+        for name in cls._context_fields:
+            if name in values:
+                context[name] = values[name]
+        with Transaction().set_context(context):
+            cls.write([user], values_clean)
 
     @classmethod
     def get_preferences_fields_view(cls):
diff --git a/trytond/version.py b/trytond/version.py
index f0cecd6..f0bfdba 100644
--- a/trytond/version.py
+++ b/trytond/version.py
@@ -1,6 +1,6 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 PACKAGE = "trytond"
-VERSION = "3.4.14"
+VERSION = "3.4.15"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-server