[tryton-debian-vcs] tryton-server branch upstream-3.6 updated. upstream/3.6.10-1-ge21053a

[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.10-1-ge21053a

commit e21053a6b5b41d2e6799d75775074221f5a430b8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Fri Aug 5 11:20:15 2016 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index 7a5c4c7..cc34def 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.11 - 2016-08-02
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.10 - 2016-07-04
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 8f62afc..4c25661 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 3.6.10
+Version: 3.6.11
 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 8f62afc..4c25661 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.10
+Version: 3.6.11
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond/__init__.py b/trytond/__init__.py
index 242b764..813badd 100644
--- a/trytond/__init__.py
+++ b/trytond/__init__.py
@@ -4,7 +4,7 @@ import os
 import time
 from email import charset
 
-__version__ = "3.6.10"
+__version__ = "3.6.11"
 
 os.environ['TZ'] = 'UTC'
 if hasattr(time, 'tzset'):
diff --git a/trytond/ir/translation.py b/trytond/ir/translation.py
index 17af7ff..585b355 100644
--- a/trytond/ir/translation.py
+++ b/trytond/ir/translation.py
@@ -1624,7 +1624,8 @@ class TranslationExport(Wizard):
 
     def default_result(self, fields):
         file_ = self.result.file
+        cast = self.result.__class__.file.cast
         self.result.file = False  # No need to store it in session
         return {
-            'file': file_,
+            'file': cast(file_) if file_ else None,
             }
-- 
tryton-server