[IMP]: module, menu: Added filter buttons in modules view, Improvement in menu view

bzr revid: rpa@openerp.co.in-20100216134719-n7qy739f2yf9nxzy

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index a3ef10f..27049f4 100644 (file)
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -996,7 +996,7 @@
             <field name="arch" type="xml">
                 <tree string="Menu" editable="top">
                     <field name="sequence"/>
-                    <field icon="icon" name="complete_name"/>
+                    <field icon="icon" name="complete_name" string="Menu"/>
                 </tree>
             </field>
         </record>
@@ -1007,8 +1007,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Menu">
-                    <field name="complete_name"/>
-                    <field name="name" select="1"/>
+                    <field name="complete_name" string="Menu"/>
+                    <field name="name" select="1" string="Root Menu"/>
                     <field name="sequence"/>
                     <field colspan="4" name="parent_id" select="1"/>
                     <field name="action"/>

diff --git a/bin/addons/base/module/module_view.xml b/bin/addons/base/module/module_view.xml
index 33a27cd..10582bb 100644 (file)
--- a/bin/addons/base/module/module_view.xml
+++ b/bin/addons/base/module/module_view.xml
@@ -38,6 +38,27 @@
         <menuitem action="action_module_category_tree" id="menu_action_module_category_tree" parent="base.menu_management"/>
 
         <!-- Click on a category -->
+        
+        <record id="view_module_filter" model="ir.ui.view">
+            <field name="name">ir.module.module.list.select</field>
+            <field name="model">ir.module.module</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search modules">
+                    <group col='10' colspan='4'>
+                        <filter icon="terp-sale" string="Installed" domain="[('state', 'in', ['installed', 'to upgrade', 'to remove'])]"/>
+                        <filter icon="terp-sale" string="Uninstalled" domain="[('state', 'in', ['uninstalled', 'uninstallable'])]"/>
+                        <filter icon="terp-sale" string="To be upgraded" domain="[('state','in', ['to upgrade', 'to remove', 'to install'])]"/>
+                        <separator orientation="vertical"/>
+                       <field name="name" select="1"/>
+                       <field name="state" readonly="1" select="1"/> 
+    
+                                       </group>
+                     
+               </search>
+            </field>
+        </record>
+        
 
         <record id="action_module_open_categ" model="ir.actions.act_window">
             <field name="name">Modules</field>
@@ -45,6 +66,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('category_id','=',active_id)]</field>
+           
         </record>
         <record id="ir_action_module_category" model="ir.values">
             <field eval="'tree_but_open'" name="key2"/>
@@ -130,34 +152,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain"/>
+             <field name="search_view_id" ref="view_module_filter"/>
         </record>
         <menuitem action="open_module_tree" id="menu_module_tree" parent="base.menu_management"/>
 
-        <record id="open_module_tree_install" model="ir.actions.act_window">
-            <field name="name">Installed modules</field>
-            <field name="res_model">ir.module.module</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state', 'in', ['installed', 'to upgrade', 'to remove'])]</field>
-        </record>
-        <menuitem action="open_module_tree_install" id="menu_module_tree_install" parent="base.menu_module_tree"/>
-        <record id="open_module_tree_uninstall" model="ir.actions.act_window">
-            <field name="name">Uninstalled modules</field>
-            <field name="res_model">ir.module.module</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state', 'in', ['uninstalled', 'uninstallable'])]</field>
-        </record>
-        <menuitem action="open_module_tree_uninstall" id="menu_module_tree_uninstall" parent="base.menu_module_tree"/>
-        <record id="open_module_tree_upgrade" model="ir.actions.act_window">
-            <field name="name">Modules to be installed, upgraded or removed</field>
-            <field name="res_model">ir.module.module</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','in', ['to upgrade', 'to remove', 'to install'])]</field>
-        </record>
-        <menuitem action="open_module_tree_upgrade" id="menu_module_tree_upgrade" parent="base.menu_module_tree"/>
-
         <record id="repository_form" model="ir.ui.view">
             <field name="name">ir.module.repository.form</field>
             <field name="model">ir.module.repository</field>

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 149e8f3..63235e1 100644 (file)
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1486,7 +1486,6 @@ class orm_template(object):
                     'client_action_relate', [(self._name, False)], False,
                     context)
             resprint = map(clean, resprint)
-            print "resprintresprint",resprint
             resaction = map(clean, resaction)
             resaction = filter(lambda x: not x.get('multi', False), resaction)
             resprint = filter(lambda x: not x.get('multi', False), resprint)