Merged with diagram branch

[odoo/odoo.git] / bin / addons / base / res / partner / partner_view.xml

diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index 8c374ac..1daeb87 100644 (file)
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -329,7 +329,6 @@
                             <field colspan="4" name="events" nolabel="1" widget="one2many_list"/>
                         </page>
                         <page string="Notes">
-                            <separator string="Description" colspan="4"/>
                             <field colspan="4" name="comment" nolabel="1"/>
                         </page>
                     </notebook>
@@ -344,11 +343,10 @@
             <field name="arch" type="xml">
                 <search string="Search Partner">
                    <group col='10' colspan='4'>
-                        <filter string="My Partners" icon="terp-partner" domain="[('parent_id','!=',False)]"/>
+                        <filter string="My Partners" icon="terp-partner" domain="[('user_id','=',uid)]"/>
                         <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"
-                            default="context.get('default_supplier',False)"/>
+                        <filter string="Suppliers" icon="terp-partner" domain="[('supplier','=',1)]" help="Supplier Partners"/>
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="address" select="1"/>
@@ -365,6 +363,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.partner</field>
             <field name="view_type">form</field>
+            <field name="context">{"search_default_supplier":supplier}</field>
             <field name="search_view_id" ref="view_res_partner_filter"/>
         </record>
         <record id="action_partner_form_view1" model="ir.actions.act_window.view">
@@ -390,7 +389,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.partner</field>
             <field name="view_type">form</field>
-            <field name="domain">[]</field>
+            <field name="domain">[('customer','=',1)]</field>
             <field name="context">{'default_customer':1}</field>
             <field name="filter" eval="True"/>
         </record>
@@ -400,7 +399,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.partner</field>
             <field name="view_type">form</field>
-            <field name="domain">[]</field>
+            <field name="domain">[('supplier','=',1)]</field>
             <field name="context">{'default_customer':0, 'default_supplier':1}</field>
             <field name="filter" eval="True"/>
         </record>