merge

[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 d6970ad..ad241fa 100644 (file)
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -96,7 +96,6 @@
                     <field name="function"/>
                     <newline/>
                       <group string="Postal Address" colspan="2" col="2">
-                        <field name="type" select="2" />
                         <field name="street" select="2"/>
                         <field name="street2"/>
                         <field name="zip" select="2"/>
@@ -105,6 +104,7 @@
                         <field name="state_id" select="2"/>
                       </group>
                       <group string="Communication" colspan="2" col="2">
+                        <field name="type" select="2" />
                         <field name="phone"/>
                         <field name="fax"/>
                         <field name="mobile" select="2"/>
@@ -255,12 +255,14 @@
                         <page string="General">
                             <field colspan="4" mode="form,tree" name="address" nolabel="1" select="1" height="260">
                                 <form string="Partner Contacts">
-                                    <field name="name" select="2"/>
-                                    <field domain="[('domain', '=', 'contact')]" name="title" string="Type"/>
-                                    <field name="function"/>
+                                    <group colspan="2" col="4">
+                                        <field name="name" select="2"/>
+                                        <field domain="[('domain', '=', 'contact')]" name="title" string="Type"/>
+                                        <field name="function"/>
+                                        <field name="type" select="2" colspan="4"/>
+                                    </group>
                                     <newline/>
                                       <group string="Postal Address" colspan="2" col="4">
-                                        <field name="type" select="2" colspan="4"/>
                                         <field name="street" select="2" colspan="4"/>
                                         <field name="street2" colspan="4"/>
                                         <field name="zip" select="2"/>
@@ -317,14 +319,15 @@
             <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)]"/>
-                               <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"/>
+                        <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'/>
+                        <field name="name" select="1"/>
+                        <field name="country" select="1"/>
                         <field name="address" select="1"/>
+                        <field name="category_id" select="1"/>
                    </group>
                </search>
             </field>