[tryton-debian-vcs] tryton-server branch upstream-4.0 updated. upstream/4.0.5-1-ge8a0417

[Mathias Behrle]

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

commit e8a0417dbe5cba3234cc31f104744a2c659c76fd
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Dec 19 11:33:41 2016 +0100

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

diff --git a/CHANGELOG b/CHANGELOG
index ea2f667..f32d53b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.0.6 - 2016-12-17
+* Bug fixes (see mercurial logs for details)
+
 Version 4.0.5 - 2016-11-06
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 4e6d392..1a4f543 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 4.0.5
+Version: 4.0.6
 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 4e6d392..1a4f543 100644
--- a/trytond.egg-info/PKG-INFO
+++ b/trytond.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 4.0.5
+Version: 4.0.6
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond/__init__.py b/trytond/__init__.py
index 5bc87e1..2218e57 100644
--- a/trytond/__init__.py
+++ b/trytond/__init__.py
@@ -5,7 +5,7 @@ import time
 import logging
 from email import charset
 
-__version__ = "4.0.5"
+__version__ = "4.0.6"
 logger = logging.getLogger(__name__)
 
 os.environ['TZ'] = 'UTC'
diff --git a/trytond/ir/translation.py b/trytond/ir/translation.py
index a62018f..45dee8a 100644
--- a/trytond/ir/translation.py
+++ b/trytond/ir/translation.py
@@ -951,7 +951,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 765d0a0..ac53906 100644
--- a/trytond/res/user.py
+++ b/trytond/res/user.py
@@ -393,7 +393,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):
-- 
tryton-server