From 54f4601aa0b65f8f881ae9d8ae52a74d41edff2e Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Thu, 26 Aug 2010 14:20:31 +0530
Subject: [PATCH] [ADD] base: Added search views to Administration-> Users.

bzr revid: uco@tinyerp.com-20100826085031-xio837lvytwfnrvv
---
 bin/addons/base/base_update.xml | 16 ++++++++--------
 bin/addons/base/ir/ir.xml       | 15 ++++++++++++++-
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 10e4607ef41..622d570d3d3 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -79,7 +79,7 @@
                     <notebook colspan="4">
                         <page string="Current Activity">
                             <field name="company_id" widget="selection" readonly="0"
-                                    context="{'user_id': self, 'user_preference': 1}"/>
+                                    context="{'user_id': self, 'user_preference': 1}" groups="base.group_multi_company"/>
                             <field name="view" readonly="0"/>
                             <label string="" colspan="2"/>
                             <field name="menu_tips" colspan="2"/>
@@ -116,14 +116,14 @@
                         <page string="User">
                             <field name="address_id" select="1"/>
                             <field name="user_email" widget="email"/>
-                            <field name="company_id" required="1" context="{'user_id': self, 'user_preference': 1}"/>
+                            <field name="company_id" required="1" context="{'user_id': self, 'user_preference': 1}" groups="base.group_multi_company"/>
                             <field name="action_id" required="True"/>
                             <field domain="[('usage','=','menu')]" name="menu_id" required="True"/>
                             <field name="context_lang"/>
                             <field name="context_tz"/>
                             <field name="view" readonly="0"/>
                             <field name="menu_tips" colspan="2"/>
-                            <label string="" colspan="2"/>
+                            <newline/>
                             <group colspan="2" col="2">
                                 <separator string="Signature" colspan="2"/>
                                 <field colspan="2" name="signature" nolabel="1"/>
@@ -152,7 +152,7 @@
                     <field name="name"/>
                     <field name="login"/>
                     <field name="address_id" string="Address" />
-                    <field name="company_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
@@ -163,10 +163,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Users">
-                    <field name="name" select="1"/>
-                    <field name="login" select="1"/>
-                    <field name="address_id" select="1" string="Address"/>
-                    <field name="company_ids" select="1" string="Company"/>
+                    <field name="name"/>
+                    <field name="login"/>
+                    <field name="address_id" string="Address"/>
+                    <field name="company_ids" string="Company"/>
                 </search>
             </field>
         </record>
diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 25da6d19da5..9010475c345 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -790,7 +790,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Role">
-                    <field name="name" select="1"/>
+                    <field name="name"/>
                     <field name="parent_id"/>
                     <separator string="Description" colspan="4"/>
                     <field name="description" nolabel="1" colspan="4"/>
@@ -820,6 +820,18 @@
                 </tree>
             </field>
         </record>
+        <record id="view_roles_search" model="ir.ui.view">
+            <field name="name">res.roles.search</field>
+            <field name="model">res.roles</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Role">
+                    <field name="name"/>
+                    <field name="parent_id"/>
+                </search>
+            </field>
+        </record>
+                    
         <record id="action_res_roles" model="ir.actions.act_window">
             <field name="name">Roles Structure</field>
             <field name="type">ir.actions.act_window</field>
@@ -836,6 +848,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.roles</field>
             <field name="view_type">form</field>
+            <field name="search_view_id" ref="view_roles_search"/>
         </record>
         <menuitem action="action_res_roles_form" id="menu_action_res_roles_form" parent="menu_action_res_roles"/>