[tryton-debian-vcs] tryton-server branch debian-jessie-3.4 updated. debian/3.4.8-1-3-g7a0a62d

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-jessie-3.4 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-server.git;a=commitdiff;h=debian/3.4.8-1-3-g7a0a62d

commit 7a0a62d0400a2855eac361ac65957204e931435e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Jan 17 19:12:09 2016 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 18e6b4b..a87d59e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-server (3.4.9-1) unstable; urgency=medium
+
+  * Merging upstream version 3.4.9.
+  * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Sun, 17 Jan 2016 19:12:08 +0100
+
 tryton-server (3.4.8-1) unstable; urgency=high
 
   * Merging upstream version 3.4.8.
commit ebcb94d8df7de352b03032dd63fbc1bdb2c06ebc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Jan 17 19:12:08 2016 +0100

    Updating copyright file.

diff --git a/debian/copyright b/debian/copyright
index eba4043..1a0dd52 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 223858baac0e9b10d97b4cb493a031b315293eed
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Jan 17 19:12:08 2016 +0100

    Merging upstream version 3.4.9.

diff --git a/CHANGELOG b/CHANGELOG
index b2b6ebc..d01024b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.9 - 2016-01-11
+* Bug fixes (see mercurial logs for details)
+
 Version 3.4.8 - 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 4c5c6fe..216949e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 3.4.8
+Version: 3.4.9
 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 4c5c6fe..216949e 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.4.8
+Version: 3.4.9
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond/model/model.py b/trytond/model/model.py
index 13e8554..dc95353 100644
--- a/trytond/model/model.py
+++ b/trytond/model/model.py
@@ -286,7 +286,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 5d1950f..344929a 100644
--- a/trytond/model/modelview.py
+++ b/trytond/model/modelview.py
@@ -307,12 +307,13 @@ class ModelView(Model):
 
         # Remove field without read access
         for field in fields_to_remove:
-            for element in tree.xpath(
+            for i, element in enumerate(tree.xpath(
                     '//field[@name="%s"] | //label[@name="%s"]'
-                    % (field, field)):
+                    % (field, field))):
                 if type == 'form':
                     element.tag = 'label'
                     element.attrib.clear()
+                    element.attrib['id'] = 'hidden %s-%s' % (field, i)
                 elif type == 'tree':
                     parent = element.getparent()
                     parent.remove(element)
diff --git a/trytond/version.py b/trytond/version.py
index 39f28a1..913ed6b 100644
--- a/trytond/version.py
+++ b/trytond/version.py
@@ -1,6 +1,6 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 PACKAGE = "trytond"
-VERSION = "3.4.8"
+VERSION = "3.4.9"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-server



More information about the tryton-debian-vcs mailing list