[tryton-debian-vcs] tryton-server branch debian-stretch-4.0 updated. debian/4.0.12-1-2-g3cb8e78

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Dec 13 10:43:34 UTC 2017


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

commit 3cb8e787a02aaaa72283001f0551426529807a8b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Dec 12 19:24:12 2017 +0100

    Releasing debian version 4.0.13-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index 0db72b4..a42b461 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-server (4.0.13-1) unstable; urgency=medium
+
+  * Merging upstream version 4.0.13.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Tue, 12 Dec 2017 19:24:12 +0100
+
 tryton-server (4.0.12-1) unstable; urgency=medium
 
   * Merging upstream version 4.0.12.
commit efb211132e4c5f6eeb3a89e933949f86873b8c48
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Dec 12 19:24:12 2017 +0100

    Merging upstream version 4.0.13.

diff --git a/CHANGELOG b/CHANGELOG
index e130222..5f23cc3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.0.13 - 2017-12-04
+* Bug fixes (see mercurial logs for details)
+
 Version 4.0.12 - 2017-11-07
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 3cc40e5..756ae69 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 4.0.12
+Version: 4.0.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 3cc40e5..756ae69 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.12
+Version: 4.0.13
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond/__init__.py b/trytond/__init__.py
index fb9d0ab..760d9d5 100644
--- a/trytond/__init__.py
+++ b/trytond/__init__.py
@@ -5,7 +5,7 @@ import time
 import logging
 from email import charset
 
-__version__ = "4.0.12"
+__version__ = "4.0.13"
 logger = logging.getLogger(__name__)
 
 os.environ['TZ'] = 'UTC'
diff --git a/trytond/model/modelstorage.py b/trytond/model/modelstorage.py
index b641a31..00a5b72 100644
--- a/trytond/model/modelstorage.py
+++ b/trytond/model/modelstorage.py
@@ -1421,7 +1421,7 @@ class ModelStorage(Model):
                 to_write = []
                 for target in targets:
                     if target.id is None or target.id < 0:
-                        if field._type == 'one2many':
+                        if field._type == 'one2many' and field.field:
                             # Don't store old target link
                             setattr(target, field.field, None)
                         to_create.append(target._save_values)
diff --git a/trytond/model/modelview.py b/trytond/model/modelview.py
index d88aed7..19cea29 100644
--- a/trytond/model/modelview.py
+++ b/trytond/model/modelview.py
@@ -725,6 +725,7 @@ class ModelView(Model):
                     del value['remove']
                 if not value:
                     continue
+                value = dict(value)
             elif field._type == 'many2many':
                 value = [r.id for r in value]
             changed[fname] = value
diff --git a/trytond/tools/misc.py b/trytond/tools/misc.py
index d2454cf..b462261 100644
--- a/trytond/tools/misc.py
+++ b/trytond/tools/misc.py
@@ -114,11 +114,11 @@ def get_smtp_server():
     :return: A SMTP instance. The quit() method must be call when all
     the calls to sendmail() have been made.
     """
-    from ..sendmail import _get_smtp_server
+    from ..sendmail import get_smtp_server
     warnings.warn(
         'get_smtp_server is deprecated use trytond.sendmail',
         DeprecationWarning)
-    return _get_smtp_server()
+    return get_smtp_server()
 
 
 def memoize(maxsize):
-- 
tryton-server



More information about the tryton-debian-vcs mailing list