[tryton-debian-vcs] tryton-server branch debian-stretch-4.2 updated. debian/4.2.7-1-2-g1156e67
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.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-server.git;a=commitdiff;h=debian/4.2.7-1-2-g1156e67
commit 1156e67f8b8f951dfcef374753c763a15f172ebd
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Dec 12 19:28:54 2017 +0100
Releasing debian version 4.2.8-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 92c35ab..6737556 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-server (4.2.8-1) unstable; urgency=medium
+
+ * Merging upstream version 4.2.8.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 12 Dec 2017 19:28:54 +0100
+
tryton-server (4.2.7-1) unstable; urgency=medium
* Use the preferred https URL format in the copyright file.
commit 8e3cf02a75ceb71f26570d65bc9840e9ec8b4ef4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Dec 12 19:28:54 2017 +0100
Merging upstream version 4.2.8.
diff --git a/CHANGELOG b/CHANGELOG
index 4ba747b..cc91cec 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.2.8 - 2017-12-04
+* Bug fixes (see mercurial logs for details)
+
Version 4.2.7 - 2017-11-07
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 4a253c5..862d1c0 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond
-Version: 4.2.7
+Version: 4.2.8
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 4a253c5..862d1c0 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.2.7
+Version: 4.2.8
Summary: Tryton server
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond/__init__.py b/trytond/__init__.py
index ba1b52e..6e69770 100644
--- a/trytond/__init__.py
+++ b/trytond/__init__.py
@@ -5,7 +5,7 @@ import time
import logging
from email import charset
-__version__ = "4.2.7"
+__version__ = "4.2.8"
logger = logging.getLogger(__name__)
os.environ['TZ'] = 'UTC'
diff --git a/trytond/model/modelstorage.py b/trytond/model/modelstorage.py
index 01d0969..6ab58bd 100644
--- a/trytond/model/modelstorage.py
+++ b/trytond/model/modelstorage.py
@@ -1433,7 +1433,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 8a2c2b4..0830859 100644
--- a/trytond/model/modelview.py
+++ b/trytond/model/modelview.py
@@ -739,6 +739,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 385b556..cae4a24 100644
--- a/trytond/tools/misc.py
+++ b/trytond/tools/misc.py
@@ -91,11 +91,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