diff --git a/bin/addons/base/res/bank_view.xml b/bin/addons/base/res/bank_view.xml
index 5b6847c5c01..554ed1911a0 100644
--- a/bin/addons/base/res/bank_view.xml
+++ b/bin/addons/base/res/bank_view.xml
@@ -12,23 +12,25 @@
                     <field name="active" select="2"/>
                     <field name="bic" select="1"/>
                     <newline/>
-                    <group string="Address" colspan="2" col="4">                    
-	                    <field name="street" select="2"/>
-	                    <field name="street2" select="2"/>
-	                    <field name="zip"/>
-	                    <field name="city"/>
-	                    <field name="country" select="2"/>
-	                    <field name="state" select="2"/>
+                    <separator string="  Address" colspan="2" col="4"/>
+                    <separator string="  Communication" colspan="2" col="4"/>
+                    <group  colspan="2" col="4">
+                        <field name="street" select="2"/>
+                        <field name="street2" select="2"/>
+                        <field name="zip"/>
+                        <field name="city"/>
+                        <field name="country" select="2"/>
+                        <field name="state" select="2"/>
                     </group>
-                    <group string="Communication" colspan="2" col="4">
-	                    <field name="phone"/>
-	                    <field name="fax"/>
-	                    <field name="email"/>
+                    <group colspan="2" col="4">
+                        <field name="phone"/>
+                        <field name="fax"/>
+                        <field name="email"/>
                     </group>
                 </form>
             </field>
         </record>
-        
+
         <record id="view_res_bank_tree" model="ir.ui.view">
             <field name="name">res.bank.tree</field>
             <field name="model">res.bank</field>
@@ -41,15 +43,15 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="action_res_bank_form" model="ir.actions.act_window">
             <field name="name">Bank List</field>
             <field name="res_model">res.bank</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        
+
         <menuitem action="action_res_bank_form" groups="group_extended" id="menu_action_res_bank_form" parent="menu_base_config" sequence="40"/>
-        
+
     </data>
 </openerp>
diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py
index e3af783db98..11eb30eedae 100644
--- a/bin/addons/base/res/partner/partner.py
+++ b/bin/addons/base/res/partner/partner.py
@@ -124,7 +124,7 @@ class res_partner(osv.osv):
         'user_id': fields.many2one('res.users', 'Salesman', help='The internal user that is in charge of communicating with this partner if any.'),
         'vat': fields.char('VAT',size=32 ,help="Value Added Tax number. Check the box if the partner is subjected to the VAT. Used by the VAT legal statement."),
         'bank_ids': fields.one2many('res.partner.bank', 'partner_id', 'Banks'),
-        'website': fields.char('Website',size=64),
+        'website': fields.char('Website',size=64, help="Link website"),
         'comment': fields.text('Notes'),
         'address': fields.one2many('res.partner.address', 'partner_id', 'Contacts'),
         'category_id': fields.many2many('res.partner.category', 'res_partner_category_rel', 'partner_id', 'category_id', 'Categories'),
@@ -291,6 +291,8 @@ class res_partner_address(osv.osv):
         'fax': fields.char('Fax', size=64),
         'mobile': fields.char('Mobile', size=64),
         'birthdate': fields.char('Birthdate', size=64),
+        'is_customer_add': fields.related('partner_id', 'customer', type='boolean', string='Customer'),
+        'is_supplier_add': fields.related('partner_id', 'supplier', type='boolean', string='Supplier'),
         'active': fields.boolean('Active', help="Uncheck the active field to hide the contact."),
 #        'company_id': fields.related('partner_id','company_id',type='many2one',relation='res.company',string='Company', store=True),
         'company_id': fields.many2one('res.company', 'Company',select=1),
diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index 715fe8efe0d..b76a2f59d34 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -21,10 +21,21 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Contact">
-                    <field name="name" select='1'/>
-                    <field name="partner_id" select='1'/>
-                    <field name="country_id" select='1'/>
-                </search>
+                    <group>
+                        <filter string="Customer" name="customer" icon="terp-crm" domain="[('is_customer_add','=','1')]" />
+                        <filter string="Supplier" name="supplier"  icon="terp-crm" domain="[('is_supplier_add','=','1')]" />
+                        <separator orientation="vertical"/>
+                        <field name="name" />
+                        <field name="partner_id" />
+                        <field name="country_id" />
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                       <filter string="Partner" icon="terp-crm" domain="[]" context="{'group_by' : 'partner_id'}" />
+                       <filter string="Country" icon="terp-crm" domain="[]" context="{'group_by' : 'country_id'}" />
+                       <filter string="Type" icon="terp-crm" domain="[]" context="{'group_by' : 'type'}" />
+                   </group>
+                 </search>
             </field>
         </record>
 
@@ -92,6 +103,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="context">{"search_default_customer":1}</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">
@@ -281,8 +293,10 @@
                                     <field name="email"/>
                                 </tree>
                             </field>
-                            <separator colspan="4" string="Categories"/>
-                            <field colspan="4" name="category_id" nolabel="1" height="90" groups="base.group_extended"/>
+                            <group  groups="base.group_extended">
+                                    <separator colspan="4" string="Categories"/>
+                                    <field  colspan="4" name="category_id" nolabel="1"/>
+                            </group>
                         </page>
                         <page string="Sales &amp; Purchases">
                             <separator string="General Information" colspan="4"/>
@@ -294,12 +308,13 @@
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             <newline/>
                         </page>
-                        <page string="History">
-                            <field colspan="4" name="events" nolabel="1" widget="one2many_list"/>
-                        </page>
                         <page string="Notes">
                             <field colspan="4" name="comment" nolabel="1"/>
                         </page>
+                        <page string="History">
+                            <field colspan="4" name="events" nolabel="1" widget="one2many_list"/>
+                        </page>
+
                     </notebook>
                 </form>
             </field>
@@ -324,7 +339,7 @@
                         </field>
                    </group>
                    <newline />
-                   <group expand="0" string="Group By..." colspan="16">
+                   <group expand="0" string="Group By...">
                        <filter string="Salesman" icon="terp-crm" domain="[]" context="{'group_by' : 'user_id'}" />
                    </group>
                </search>
@@ -487,40 +502,6 @@
             </field>
         </record>
 
-        <!--
-          ======================
-          Company Architecture
-          ======================
-        -->
-        <record id="view_partner_tree2" model="ir.ui.view">
-            <field name="name">res.partner.tree</field>
-            <field name="model">res.partner</field>
-            <field name="type">tree</field>
-            <field name="field_parent">child_ids</field>
-            <field name="arch" type="xml">
-                <tree string="Partners">
-                    <field name="name"/>
-                    <field name="lang"/>
-                    <field name="ref"/>
-                </tree>
-            </field>
-        </record>
-        <record id="action2" model="ir.actions.act_window">
-            <field name="name">Company Architecture</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">res.partner</field>
-            <field name="domain">[('id','in',active_ids)]</field>
-            <field name="view_type">tree</field>
-            <field name="view_id" ref="view_partner_tree2"/>
-        </record>
-        <record id="ir_partner_structure" model="ir.values">
-            <field eval="'client_action_multi'" name="key2"/>
-            <field eval="'res.partner'" name="model"/>
-            <field name="name">Company Architecture</field>
-            <field eval="'ir.actions.act_window,'+str(action2)" name="value"/>
-            <field eval="True" name="object"/>
-        </record>
-
         <!--
           ======================
           Categories