[tryton-debian-vcs] tryton-server branch debian-jessie-3.2 updated. debian/3.2.5-1-2-g706dc45

[Mathias Behrle]

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

commit 706dc45fe7b0c8be27803bc18280d1604f23d2d9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 31 14:29:36 2015 +0200

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

diff --git a/debian/changelog b/debian/changelog
index e22bb1a..a61cdfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-server (3.2.6-1) unstable; urgency=medium
+
+  * Merging upstream version 3.2.6.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Tue, 31 Mar 2015 14:29:36 +0200
+
 tryton-server (3.2.5-1) unstable; urgency=medium
 
   * Adding actual upstream signing key.
commit 62c0c12d3ba733b0bebc9e4d9e82b06c8e0a9301
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 31 14:29:36 2015 +0200

    Merging upstream version 3.2.6.

diff --git a/CHANGELOG b/CHANGELOG
index 238e82a..12263cb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.6 - 2015-03-30
+* Bug fixes (see mercurial logs for details)
+
 Version 3.2.5 - 2015-02-16
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index d894482..92bdefd 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 3.2.5
+Version: 3.2.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 d894482..92bdefd 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.5
+Version: 3.2.6
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond/ir/model.py b/trytond/ir/model.py
index cb63303..abc0d99 100644
--- a/trytond/ir/model.py
+++ b/trytond/ir/model.py
@@ -556,7 +556,13 @@ class ModelAccess(ModelSQL, ModelView):
         elif field._type == 'reference':
             selection = field.selection
             if isinstance(selection, basestring):
-                selection = getattr(Model, field.selection)()
+                sel_func = getattr(Model, field.selection)
+                if (not hasattr(sel_func, 'im_self')
+                        or sel_func.im_self):
+                    selection = sel_func()
+                else:
+                    # XXX Can not check access right on instance method
+                    selection = []
             for model_name, _ in selection:
                 if not cls.check(model_name, mode=mode,
                         raise_exception=False):
diff --git a/trytond/model/fields/reference.py b/trytond/model/fields/reference.py
index 1e3b378..b1f9a04 100644
--- a/trytond/model/fields/reference.py
+++ b/trytond/model/fields/reference.py
@@ -1,6 +1,8 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 from types import NoneType
+import warnings
+
 from sql import Cast, Literal, Query, Expression
 from sql.functions import Substring, Position
 
@@ -31,8 +33,12 @@ class Reference(Field):
             select=select, on_change=on_change, on_change_with=on_change_with,
             depends=depends, context=context, loading=loading)
         self.selection = selection or None
-        self.selection_change_with = selection_change_with
-
+        self.selection_change_with = set()
+        if selection_change_with:
+            warnings.warn('selection_change_with argument is deprecated, '
+                'use the depends decorator',
+                DeprecationWarning, stacklevel=2)
+            self.selection_change_with |= set(selection_change_with)
     __init__.__doc__ += Field.__init__.__doc__
 
     def get(self, ids, model, name, values=None):
diff --git a/trytond/model/modelstorage.py b/trytond/model/modelstorage.py
index 6698c98..f463813 100644
--- a/trytond/model/modelstorage.py
+++ b/trytond/model/modelstorage.py
@@ -885,7 +885,7 @@ class ModelStorage(Model):
         def validate_domain(field):
             if not field.domain:
                 return
-            if field._type == 'dict':
+            if field._type in ['dict', 'reference']:
                 return
             if field._type in ('many2one', 'one2many'):
                 Relation = pool.get(field.model_name)
diff --git a/trytond/res/group.py b/trytond/res/group.py
index 800b13d..7bd6fb0 100644
--- a/trytond/res/group.py
+++ b/trytond/res/group.py
@@ -25,10 +25,8 @@ class MenuMany2Many(fields.Many2Many):
                             ('id', 'in', sub_ids),
                             ])))
         menu_ids = set(chain(*test_ids))
-        for ids in res.itervalues():
-            for id_ in ids[:]:
-                if id_ not in menu_ids:
-                    ids.remove(id_)
+        for group_id, ids in res.iteritems():
+            res[group_id] = tuple(id_ for id_ in ids if id_ in menu_ids)
         return res
 
 
diff --git a/trytond/version.py b/trytond/version.py
index 3174281..46848d3 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.5"
+VERSION = "3.2.6"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-server