diff --git a/CHANGELOG b/CHANGELOG index 123c1244a9..81e0c63b8b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,4 @@ +* Add active field to views of action window * Make global cache depends on explicit context keys * Don't add to global cache Binary fields * Add MatchMixin diff --git a/trytond/ir/action.py b/trytond/ir/action.py index 873a13171d..4bf0c4aaa6 100644 --- a/trytond/ir/action.py +++ b/trytond/ir/action.py @@ -902,12 +902,17 @@ class ActionActWindowView(ModelSQL, ModelView): ondelete='CASCADE') act_window = fields.Many2One('ir.action.act_window', 'Action', ondelete='CASCADE') + active = fields.Boolean('Active', select=True) @classmethod def __setup__(cls): super(ActionActWindowView, cls).__setup__() cls._order.insert(0, ('sequence', 'ASC')) + @staticmethod + def default_active(): + return True + @classmethod def __register__(cls, module_name): TableHandler = backend.get('TableHandler') diff --git a/trytond/ir/view/action_act_window_view_form.xml b/trytond/ir/view/action_act_window_view_form.xml index d282a67143..689eac0128 100644 --- a/trytond/ir/view/action_act_window_view_form.xml +++ b/trytond/ir/view/action_act_window_view_form.xml @@ -1,11 +1,13 @@ -
diff --git a/trytond/ir/view/action_act_window_view_list.xml b/trytond/ir/view/action_act_window_view_list.xml index 5868cf79da..4f8c136324 100644 --- a/trytond/ir/view/action_act_window_view_list.xml +++ b/trytond/ir/view/action_act_window_view_list.xml @@ -5,4 +5,5 @@ this repository contains the full copyright notices and license terms. -->