[tryton-debian-vcs] tryton-server branch upstream-2.6 updated. upstream/2.6.16-1-g6805a11

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Tue Mar 31 12:45:37 UTC 2015


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

commit 6805a1146fbde0d3d25867e8ae6ff575ab38ad83
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 31 14:26:14 2015 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index 5e007b4..aaa84a0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.17 - 2015-03-30
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.16 - 2015-02-16
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index e1553e6..e85b9e9 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 2.6.16
+Version: 2.6.17
 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 e1553e6..e85b9e9 100644
--- a/trytond.egg-info/PKG-INFO
+++ b/trytond.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 2.6.16
+Version: 2.6.17
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond/res/group.py b/trytond/res/group.py
index 9f6c086..106bd42 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 5f6383b..7c7aaf2 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 = "2.6.16"
+VERSION = "2.6.17"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-server



More information about the tryton-debian-vcs mailing list