merge

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

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')

trytond/ir/view/action_act_window_view_form.xml

@@ -1,11 +1,13 @@
 <?xml version="1.0"?>
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
-<form string="View" col="2">
+<form string="View">
     <label name="act_window"/>
-    <field name="act_window"/>
+    <field name="act_window" colspan="3"/>
     <label name="sequence"/>
     <field name="sequence"/>
+    <label name="active"/>
+    <field name="active"/>
     <label name="view"/>
     <field name="view"/>
 </form>

trytond/ir/view/action_act_window_view_list.xml

@@ -5,4 +5,5 @@ this repository contains the full copyright notices and license terms. -->
     <field name="act_window"/>
     <field name="sequence"/>
     <field name="view"/>
+    <field name="active" tree_invisible="1"/>
 </tree>