[tryton-debian-vcs] tryton-server branch debian-stretch-3.6 updated. debian/3.6.10-1-2-g988bc72
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Mon Aug 8 09:25:57 UTC 2016
The following commit has been merged in the debian-stretch-3.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-server.git;a=commitdiff;h=debian/3.6.10-1-2-g988bc72
commit 988bc723dbba1e894968244c095472ab69526211
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Aug 5 11:20:16 2016 +0200
Releasing debian version 3.6.11-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 577d3ae..92e41e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-server (3.6.11-1) unstable; urgency=medium
+
+ * Merging upstream version 3.6.11.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Fri, 05 Aug 2016 11:20:16 +0200
+
tryton-server (3.6.10-1) unstable; urgency=medium
* Merging upstream version 3.6.10.
commit cdb93647490a6085cb4b1cfde77c7b4f825c5584
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Aug 5 11:20:16 2016 +0200
Merging upstream version 3.6.11.
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
More information about the tryton-debian-vcs
mailing list