[tryton-debian-vcs] tryton-server branch debian-stretch-3.6 updated. debian/3.6.5-1-3-gedebceb

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Sun Jan 17 20:31:15 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.5-1-3-gedebceb

commit edebceb4cc23c20d06445eec480898e699f774fb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Jan 17 19:14:30 2016 +0100

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

diff --git a/debian/changelog b/debian/changelog
index c847201..e9d8eed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-server (3.6.6-1) unstable; urgency=medium
+
+  * Merging upstream version 3.6.6.
+  * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Sun, 17 Jan 2016 19:14:30 +0100
+
 tryton-server (3.6.5-1) unstable; urgency=high
 
   * Merging upstream version 3.6.5.
commit 812778ae43f7df2c07323b74c2cfc8ffcf9dff82
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Jan 17 19:14:29 2016 +0100

    Updating copyright file.

diff --git a/debian/copyright b/debian/copyright
index e72a9d8..c861e24 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,9 +2,9 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
 Copyright: 2004-2008 Tiny SPRL
-           2007-2015 Cédric Krier
+           2007-2016 Cédric Krier
            2007-2013 Bertrand Chenal
-           2008-2015 B2CK SPRL
+           2008-2016 B2CK SPRL
            2011 Openlabs Technologies & Consulting (P) Ltd
 License: GPL-3+
 
commit 1c8fa1a2211e52e7c8a2edbf5f07a757fc3304f3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Jan 17 19:14:29 2016 +0100

    Merging upstream version 3.6.6.

diff --git a/CHANGELOG b/CHANGELOG
index cf8cef8..6eac27e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.6 - 2016-01-11
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.5 - 2015-12-16
 * Bug fixes (see mercurial logs for details)
 * Check all fields when writing a sequence of records, values (CVE-2015-0861)
diff --git a/COPYRIGHT b/COPYRIGHT
index 16cc09a..41201b2 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
 Copyright (C) 2004-2008 Tiny SPRL.
-Copyright (C) 2007-2015 Cédric Krier.
+Copyright (C) 2007-2016 Cédric Krier.
 Copyright (C) 2007-2013 Bertrand Chenal.
-Copyright (C) 2008-2015 B2CK SPRL.
+Copyright (C) 2008-2016 B2CK SPRL.
 Copyright (C) 2011 Openlabs Technologies & Consulting (P) Ltd.
 
 This program is free software: you can redistribute it and/or modify
diff --git a/PKG-INFO b/PKG-INFO
index 85e13cf..395efbe 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 3.6.5
+Version: 3.6.6
 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 85e13cf..395efbe 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.5
+Version: 3.6.6
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond/__init__.py b/trytond/__init__.py
index 641a3db..933c1c1 100644
--- a/trytond/__init__.py
+++ b/trytond/__init__.py
@@ -4,7 +4,7 @@ import os
 import time
 from email import charset
 
-__version__ = "3.6.5"
+__version__ = "3.6.6"
 
 os.environ['TZ'] = 'UTC'
 if hasattr(time, 'tzset'):
diff --git a/trytond/model/model.py b/trytond/model/model.py
index eca190f..17861e4 100644
--- a/trytond/model/model.py
+++ b/trytond/model/model.py
@@ -232,7 +232,7 @@ class Model(WarningErrorMixin, URLMixin, PoolBase):
                     res[field][arg] = copy.copy(getattr(cls._fields[field],
                         arg))
             if (isinstance(cls._fields[field],
-                        (fields.Function, fields.One2Many))
+                        (fields.Function, fields.One2Many, fields.Many2Many))
                     and not getattr(cls, 'order_%s' % field, None)):
                 res[field]['sortable'] = False
             if ((isinstance(cls._fields[field], fields.Function)
diff --git a/trytond/model/modelview.py b/trytond/model/modelview.py
index 8838bf3..cf84941 100644
--- a/trytond/model/modelview.py
+++ b/trytond/model/modelview.py
@@ -432,13 +432,14 @@ class ModelView(Model):
             xpath = ('//field[@name="%(field)s"] | //label[@name="%(field)s"]'
                 ' | //page[@name="%(field)s"] | //group[@name="%(field)s"]'
                 ' | //separator[@name="%(field)s"]') % {'field': field}
-            for element in tree.xpath(xpath):
+            for i, element in enumerate(tree.xpath(xpath)):
                 if type == 'tree' or element.tag == 'page':
                     parent = element.getparent()
                     parent.remove(element)
                 elif type == 'form':
                     element.tag = 'label'
                     element.attrib.clear()
+                    element.attrib['id'] = 'hidden %s-%s' % (field, i)
 
         if type == 'tree':
             ViewTreeWidth = pool.get('ir.ui.view_tree_width')
@@ -695,6 +696,9 @@ class ModelView(Model):
                 if value:
                     if isinstance(value, ModelStorage):
                         changed['%s.rec_name' % fname] = value.rec_name
+                    if value.id is None:
+                        # Don't consider temporary instance as a change
+                        continue
                     if field._type == 'reference':
                         value = str(value)
                     else:
-- 
tryton-server



More information about the tryton-debian-vcs mailing list