[tryton-debian-vcs] tryton-server branch debian-stretch-3.8 updated. debian/3.8.12-1-2-g1b5bd19
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Sun Jul 2 17:58:07 UTC 2017
The following commit has been merged in the debian-stretch-3.8 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-server.git;a=commitdiff;h=debian/3.8.12-1-2-g1b5bd19
commit 1b5bd19d8e1abecdb02cafaebfa6bb250b93e264
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Jul 2 16:56:27 2017 +0200
Releasing debian version 3.8.13-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 399bf1d..c7942f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-server (3.8.13-1) unstable; urgency=medium
+
+ * Merging upstream version 3.8.13.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sun, 02 Jul 2017 16:56:27 +0200
+
tryton-server (3.8.12-1) unstable; urgency=medium
* Merging upstream version 3.8.12.
commit 9cd73d392dc53f5645388d5e18459e54488c1ba2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Jul 2 16:56:27 2017 +0200
Merging upstream version 3.8.13.
diff --git a/CHANGELOG b/CHANGELOG
index a4313b0..3fc7fb0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.8.13 - 2017-07-01
+* Bug fixes (see mercurial logs for details)
+
Version 3.8.12 - 2017-06-05
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 5c32dc3..a2d8b1b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond
-Version: 3.8.12
+Version: 3.8.13
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 5c32dc3..a2d8b1b 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.8.12
+Version: 3.8.13
Summary: Tryton server
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond/__init__.py b/trytond/__init__.py
index c010864..a9c1ca1 100644
--- a/trytond/__init__.py
+++ b/trytond/__init__.py
@@ -4,7 +4,7 @@ import os
import time
from email import charset
-__version__ = "3.8.12"
+__version__ = "3.8.13"
os.environ['TZ'] = 'UTC'
if hasattr(time, 'tzset'):
diff --git a/trytond/ir/action.py b/trytond/ir/action.py
index 5ff7e7f..ab55d5c 100644
--- a/trytond/ir/action.py
+++ b/trytond/ir/action.py
@@ -981,6 +981,25 @@ class ActionActWindowDomain(ModelSQL, ModelView):
'action': action.rec_name,
})
+ @classmethod
+ def create(cls, vlist):
+ pool = Pool()
+ domains = super(ActionActWindowDomain, cls).create(vlist)
+ pool.get('ir.action.keyword')._get_keyword_cache.clear()
+ return domains
+
+ @classmethod
+ def write(cls, domains, values, *args):
+ pool = Pool()
+ super(ActionActWindowDomain, cls).write(domains, values, *args)
+ pool.get('ir.action.keyword')._get_keyword_cache.clear()
+
+ @classmethod
+ def delete(cls, domains):
+ pool = Pool()
+ super(ActionActWindowDomain, cls).delete(domains)
+ pool.get('ir.action.keyword')._get_keyword_cache.clear()
+
class ActionWizard(ActionMixin, ModelSQL, ModelView):
"Action wizard"
diff --git a/trytond/ir/ui/menu.py b/trytond/ir/ui/menu.py
index e7ee292..e603527 100644
--- a/trytond/ir/ui/menu.py
+++ b/trytond/ir/ui/menu.py
@@ -7,6 +7,7 @@ from sql.conditionals import Case
from trytond.model import ModelView, ModelSQL, fields
from trytond.transaction import Transaction
+from trytond.tools import grouped_slice
from trytond.pool import Pool
from trytond.rpc import RPC
@@ -183,10 +184,12 @@ class UIMenu(ModelSQL, ModelView):
return menus
if menus:
- parent_ids = [x.parent.id for x in menus if x.parent]
- parents = cls.search([
- ('id', 'in', parent_ids),
- ])
+ parent_ids = {x.parent.id for x in menus if x.parent}
+ parents = set()
+ for sub_parent_ids in grouped_slice(parent_ids):
+ parents.update(cls.search([
+ ('id', 'in', list(sub_parent_ids)),
+ ]))
menus = [x for x in menus
if (x.parent and x.parent in parents) or not x.parent]
--
tryton-server
More information about the tryton-debian-vcs
mailing list