From 4ea52f36859a7a745e8162be70aa2881c42fc803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Apr 2012 12:19:14 +0200 Subject: [PATCH 1/5] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 04afeedf6a..2463d52610 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -12,7 +12,7 @@ 'name_fr_FR': 'Tableau de bord', 'name_nl_NL': 'Prikbord', 'name_ru_RU': 'Информационная панель', - 'version': '2.4.0', + 'version': '2.4.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From a72d0dd9acedb5babcf315a85570e24afa1731dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 4 Feb 2013 19:56:02 +0100 Subject: [PATCH 2/5] Prevent access rule error on act_window review656003 (transplanted from ccbae69cd482628aa4d0114b2842a2684d8d1dfc) --- dashboard.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dashboard.py b/dashboard.py index 83eb03a4a1..d6f684da88 100644 --- a/dashboard.py +++ b/dashboard.py @@ -1,6 +1,7 @@ #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 trytond.model import ModelView, ModelSQL, fields +from trytond.pyson import Eval class DashboardAction(ModelSQL, ModelView): @@ -14,6 +15,11 @@ class DashboardAction(ModelSQL, ModelView): required=True, ondelete='CASCADE', domain=[ ('res_model', '!=', None), ('res_model', '!=', ''), + # XXX copy ir.action rule to prevent access rule error + ['OR', + ('groups', 'in', Eval('context', {}).get('groups', [])), + ('groups', '=', None), + ], ]) def __init__(self): From 19998431943d475aa3989f4c979dbafae6bd66d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 12 Feb 2013 19:08:44 +0100 Subject: [PATCH 3/5] Prepare release 2.4.1 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index a751c5017e..99448f87ea 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.4.1 - 2013-02-12 +* Bug fixes (see mercurial logs for details) + Version 2.4.0 - 2012-04-23 * Bug fixes (see mercurial logs for details) diff --git a/COPYRIGHT b/COPYRIGHT index 8ad4b798aa..39f9196719 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,6 +1,6 @@ -Copyright (C) 2009-2012 Cédric Krier. +Copyright (C) 2009-2013 Cédric Krier. Copyright (C) 2009-2012 Bertrand Chenal. -Copyright (C) 2009-2012 B2CK SPRL. +Copyright (C) 2009-2013 B2CK SPRL. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by From 7f650d9bcb5294b07d8b0d9729f25914b0cf2c78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 12 Feb 2013 19:08:45 +0100 Subject: [PATCH 4/5] Added tag 2.4.1 for changeset 184ab7f86799 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 2b05e9d5f9..6a8cd8f56f 100644 --- a/.hgtags +++ b/.hgtags @@ -4,3 +4,4 @@ e037ec26748b385014a93507201c4e23ce7a9059 2.0.0 90ba5d041ead63adb3102ada77c6d25ca02f807a 2.2.0 1b5704670cd771876b1938cc05464e382e8b4602 2.4.0 +184ab7f86799262544eb6a2a52c517e15f20385c 2.4.1 From 18e9e38379c8cdeccfcf4f24e94be9630d1ad323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 12 Feb 2013 19:08:57 +0100 Subject: [PATCH 5/5] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 2463d52610..8d55e3d799 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -12,7 +12,7 @@ 'name_fr_FR': 'Tableau de bord', 'name_nl_NL': 'Prikbord', 'name_ru_RU': 'Информационная панель', - 'version': '2.4.1', + 'version': '2.4.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',