[tryton-debian-vcs] tryton-server branch upstream-3.2 updated. upstream/3.2.11-1-g928260f

[Mathias Behrle]

The following commit has been merged in the upstream-3.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-server.git;a=commitdiff;h=upstream/3.2.11-1-g928260f

commit 928260f5709d8ff5efdef2c639d4d1c9831f100b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Jan 17 19:09:47 2016 +0100

    Adding upstream version 3.2.12.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index e07a090..0e457ce 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.12 - 2016-01-11
+* Bug fixes (see mercurial logs for details)
+
 Version 3.2.11 - 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 9b321c7..5a3cdbe 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 3.2.11
+Version: 3.2.12
 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 9b321c7..5a3cdbe 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.2.11
+Version: 3.2.12
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond/model/model.py b/trytond/model/model.py
index 8458697..a6b73e6 100644
--- a/trytond/model/model.py
+++ b/trytond/model/model.py
@@ -297,7 +297,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 fd74399..7f1b2a4 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 0ddedca..ead27c9 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.2.11"
+VERSION = "3.2.12"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-server