[tryton-debian-vcs] tryton-server branch upstream-3.6 updated. upstream/3.6.12-1-g3c6e718

[Mathias Behrle]

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

commit 3c6e718b37ca4df5f8a98a870aac3c6f8106a19e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Dec 19 11:28:16 2016 +0100

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

diff --git a/CHANGELOG b/CHANGELOG
index a5a5204..5c549db 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.13 - 2016-12-17
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.12 - 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 6161dd2..09a9a36 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 3.6.12
+Version: 3.6.13
 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 6161dd2..09a9a36 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.6.12
+Version: 3.6.13
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond/__init__.py b/trytond/__init__.py
index 4232853..a76fe20 100644
--- a/trytond/__init__.py
+++ b/trytond/__init__.py
@@ -4,7 +4,7 @@ import os
 import time
 from email import charset
 
-__version__ = "3.6.12"
+__version__ = "3.6.13"
 
 os.environ['TZ'] = 'UTC'
 if hasattr(time, 'tzset'):
diff --git a/trytond/ir/translation.py b/trytond/ir/translation.py
index 585b355..5b8fc43 100644
--- a/trytond/ir/translation.py
+++ b/trytond/ir/translation.py
@@ -932,7 +932,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 794251d..37896a9 100644
--- a/trytond/res/user.py
+++ b/trytond/res/user.py
@@ -397,7 +397,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