Improved views

bzr revid: hda@tinyerp.com-20091029134643-vwrdtm63yrh7mq9n

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index fa1f407..3fbd24b 100644 (file)
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -94,12 +94,12 @@
             <field name="arch" type="xml">
                 <form string="Users">
                     <field name="name" select="1"/>
-                    <field name="active" select="1"/>
+                    <field name="active"/>
                     <field name="login" select="1"/>
                     <field name="password" password="True"/>
                     <notebook colspan="4">
                         <page string="User">
-                            <field name="address_id"/>
+                            <field name="address_id" select="1"/>
                             <field name="company_id" required="1"/>
                             <field name="action_id" required="True"/>
                             <field domain="[('usage','=','menu')]" name="menu_id" required="True"/>
@@ -114,7 +114,7 @@
                             <field colspan="4" nolabel="1" name="roles_id"/>
                         </page>
                         <page string="Accepted Companies">
-                            <field colspan="4" nolabel="1" name="company_ids"/>
+                            <field colspan="4" nolabel="1" name="company_ids" select="1"/>
                         </page>
                     </notebook>
                 </form>
@@ -132,6 +132,19 @@
             </field>
         </record>
 
+        <record id="view_users_search" model="ir.ui.view">
+            <field name="name">res.users.search</field>
+            <field name="model">res.users</field>
+            <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="Partner"/>
+                    <field name="company_ids" select="1" string="Company"/>
+                </search>
+            </field>
+        </record>
         <!--
     ======================
     Company

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 2426102..23522f9 100644 (file)
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -440,6 +440,7 @@
             <field name="res_model">res.users</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_users_tree"/>
+            <field name="search_view_id" ref="view_users_search"/>
         </record>
         <record id="action_res_users_view1" model="ir.actions.act_window.view">
             <field eval="10" name="sequence"/>

diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index f701284..6a3c791 100644 (file)
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -46,6 +46,19 @@
     Partner Address
     =====================
     -->
+    
+       <record id="view_res_partner_address_filter" model="ir.ui.view">
+                   <field name="name">res.partner.address.select</field>
+                   <field name="model">res.partner.address</field>
+                   <field name="type">search</field>
+                   <field name="arch" type="xml">
+                       <search string="Search Contact">
+                               <field name="partner_id" select='1'/>
+                               <field name="country_id" select='1'/>
+                      </search>
+                   </field>
+           </record>
+           
         <record id="view_partner_address_tree" model="ir.ui.view">
             <field name="name">res.partner.address.tree</field>
             <field name="model">res.partner.address</field>
@@ -103,6 +116,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.partner.address</field>
             <field name="view_type">form</field>
+            <field name="search_view_id" ref="view_res_partner_address_filter"/>
         </record>
         <record id="action_partner_address_form_view1" model="ir.actions.act_window.view">
             <field eval="10" name="sequence"/>
@@ -216,8 +230,6 @@
             </field>
         </record>
 
-
-
         <record id="view_partner_form" model="ir.ui.view">
             <field name="name">res.partner.form</field>
             <field name="model">res.partner</field>
@@ -297,10 +309,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Partner">
-                   <group col='6' colspan='4'>                     
-                       <filter string="Customers" icon="terp-partner" domain="[('customer','=',1)]" help="Customer Partners"/>
-                       <filter string="Suppliers" icon="terp-partner" domain="[('supplier','=',1)]" help="Supplier Partners"/>
+                   <group col='10' colspan='4'>
+                               <filter string="My Partners" icon="terp-partner" domain="[('parent_id','!=',False)]"/>
+                               <separator orientation="vertical"/>
+                               <filter string="Customers" icon="terp-partner" domain="[('customer','=',1)]" help="Customer Partners"/>
+                               <filter string="Suppliers" icon="terp-partner" domain="[('supplier','=',1)]" help="Supplier Partners"/>
+                        <separator orientation="vertical"/>
                         <field name="name" select='1'/>
+                        <field name="country" select='1'/>
                    </group>
                </search>
             </field>