diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py
index 8fcb794b08e..2baf988297f 100644
--- a/openerp/addons/base/ir/ir_ui_view.py
+++ b/openerp/addons/base/ir/ir_ui_view.py
@@ -76,6 +76,8 @@ class view(osv.osv):
     def _check_xml(self, cr, uid, ids, context=None):
         for view in self.browse(cr, uid, ids, context):
             eview = etree.fromstring(view.arch.encode('utf8'))
+            if eview.get('layout') or eview.get('validate'):
+                continue
             frng = tools.file_open(os.path.join('base','rng','view.rng'))
             try:
                 relaxng_doc = etree.parse(frng)
diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 6f04c3483cd..c8065403148 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -310,7 +310,7 @@ class res_partner(osv.osv):
             cr.execute('''SELECT partner.id FROM res_partner partner
                           LEFT JOIN res_partner company ON partner.parent_id = company.id
                           WHERE partner.name || ' (' || COALESCE(company.name,'') || ')'
-                          ''' + operator + ''' %s ''', (name2,))
+                          ''' + operator + ''' %s limit '''+str(limit), (name2,))
             ids = map(lambda x: x[0], cr.fetchall())
             if args:
                 ids = self.search(cr, uid, [('id', 'in', ids)] + args, limit=limit, context=context)
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index ffbbca3eb74..2f6a1412484 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -331,27 +331,24 @@
             <field name="model">res.partner</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Partners">
+                <form string="Partners" validate="0">
                     <group col="8" colspan="4">
-                        <group col="4" colspan="4">
-                            <field name="name" required="1"/>
-                            <field name="title" size="0" groups="base.group_extended" domain="[('domain', '=', 'contact')]"/>
-                            <newline/>
-                            <field name="function" attrs="{'invisible': [('is_company', '=', True)]}" colspan="4"/>
-                            <field name="parent_id" string="Company" colspan="4" attrs="{'invisible': [('is_company','=', True)]}"
-                                domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
-                                on_change="onchange_address(use_parent_address, parent_id)"/>
+                        <group col="2">
+                            <field name="photo" widget='image' nolabel="1"/>
+                        </group>
+                        <group colspan="4">
+                            <h2><field name="name" required="1" nolabel="1" colspan="4"/></h2><newline/>
+                                <field name="function" attrs="{'invisible': [('is_company', '=', True)]}"/>
+                                <field name="title" size="0" groups="base.group_extended" domain="[('domain', '=', 'contact')]"/>
+                                <field name="parent_id" string="Company" attrs="{'invisible': [('is_company','=', True)]}"
+                                    domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
+                                    on_change="onchange_address(use_parent_address, parent_id)"/>
                         </group>
                         <group col="2">
                             <field name="is_company" on_change="onchange_type(is_company)"/>
-                        </group>
-                        <group col="2">
                             <field name="customer"/>
                             <field name="supplier"/>
                         </group>
-                        <group col="2">
-                            <field name="photo" widget='image' nolabel="1"/>
-                        </group>
                     </group>
                     <notebook colspan="4">
                         <page string="General">
@@ -372,7 +369,6 @@
                             </group>
                             <group colspan="2">
                                 <separator string="Communication" colspan="4"/>
-                                <field name="lang" colspan="4"/>
                                 <field name="phone" colspan="4"/>
                                 <field name="mobile" colspan="4"/>
                                 <field name="fax" colspan="4"/>
@@ -381,77 +377,61 @@
                                 <field name="ref" groups="base.group_extended" colspan="4"/>
                             </group>
                             <group colspan="4" attrs="{'invisible': [('is_company','=', False)]}">
-                                <field name="child_ids" context="{'default_parent_id': active_id}" nolabel="1">
-                                <form string="Partners">
-                                    <group col="8" colspan="4">
-                                        <group col="4" colspan="4">
-                                            <field name="name" required="1"/>
-                                            <field name="title" size="0" groups="base.group_extended" domain="[('domain', '=', 'contact')]"/>
-                                            <newline/>
-                                            <field name="function" attrs="{'invisible': [('is_company', '=', True)]}" colspan="4"/>
-                                            <field name="parent_id" string="Company" colspan="4" attrs="{'invisible': [('is_company','=', True)]}"
-                                                domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
-                                                on_change="onchange_address(use_parent_address, parent_id)" invisible="1"/>
-                                        </group>
-                                        <group col="2">
-                                            <field name="is_company" on_change="onchange_type(is_company)" invisible="1"/>
-                                        </group>
-                                        <group col="2">
-                                            <field name="customer"/>
-                                            <field name="supplier"/>
-                                        </group>
-                                        <group col="2">
-                                            <field name="photo" widget='image' nolabel="1"/>
-                                        </group>
-                                    </group>
-                            <notebook colspan="4">
-                                <page string="General">
-                                    <group colspan="2">
-                                        <separator string="Address" colspan="4"/>
-                                        <field name="type" string="Type" attrs="{'invisible': [('is_company','=', True)]}"/>
-                                        <group colspan="2">
-                                            <field name="use_parent_address" attrs="{'invisible': [('is_company','=', True)]}" on_change="onchange_address(use_parent_address, parent_id)"/>
-                                        </group>
-                                        <newline/>
-                                            <field name="street" colspan="4"/>
-                                            <field name="street2" colspan="4"/>
-                                            <field name="zip"/>
-                                            <field name="city"/>
-                                            <field name="country_id"/>
-                                            <field name="state_id"/>
-                                        </group>
-                                        <group colspan="2">
-                                            <separator string="Communication" colspan="4"/>
-                                            <field name="lang" colspan="4"/>
-                                            <field name="phone" colspan="4"/>
-                                            <field name="mobile" colspan="4"/>
-                                            <field name="fax" colspan="4"/>
-                                            <field name="email" widget="email" colspan="4"/>
-                                            <field name="website" widget="url" colspan="4"/>
-                                            <field name="ref" groups="base.group_extended" colspan="4"/>
-                                        </group>
-                                    </page>
-                                    <page string="Sales &amp; Purchases" attrs="{'invisible': [('customer', '=', False), ('supplier', '=', False)]}">
-                                        <separator string="General Information" colspan="4"/>
-                                            <field name="user_id"/>
-                                            <field name="active" groups="base.group_extended"/>
-                                            <field name="date"/>
-                                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                        <newline/>
-                                    </page>
-                                    <page string="Categories" groups="base.group_extended">
-                                        <field name="category_id" colspan="4" nolabel="1"/>
-                                    </page>
-                                    <page string="Notes">
-                                        <field name="comment" colspan="4" nolabel="1"/>
-                                    </page>
-                                </notebook>
-                            </form>
-                                </field>
+                            <field name="child_ids" context="{'default_parent_id': active_id}" nolabel="1" mode="kanban,list">
+                                <kanban>
+                                    <field name="color"/>
+                                    <field name="name"/>
+                                    <field name="title"/>
+                                    <field name="email"/>
+                                    <field name="parent_id"/>
+                                    <field name="is_company"/>
+                                    <field name="function"/>
+                                    <field name="phone"/>
+                                    <field name="street"/>
+                                    <field name="street2"/>
+                                    <field name="photo"/>
+                                    <field name="zip"/>
+                                    <field name="city"/>
+                                    <field name="country_id"/>
+                                    <field name="mobile"/>
+                                    <field name="state_id"/>
+                                    <templates>
+                                        <t t-name="kanban-box">
+                                            <t t-set="color" t-value="kanban_color(record.color.raw_value)"/>
+                                            <div t-att-class="color + (record.title.raw_value == 1 ? ' oe_kanban_color_alert' : '')">
+                                                <div class="oe_module_vignette">
+                                                <a type="edit">
+                                                    <img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_form_avatar oe_kanban_avatar_toto"/>
+                                                </a>
+                                                    <div class="oe_module_desc">
+                                                        <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger oe_kanban_color_border">
+                                                            <table class="oe_kanban_table">
+                                                                <tr>
+                                                                    <td class="oe_kanban_title1" align="left" valign="middle">
+                                                                        <h4><a type="edit"><field name="name"/></a></h4>
+                                                                        <i><div t-if="record.function.raw_value">
+                                                                            <field name="function"/><br/></div></i>
+                                                                    </td>
+                                                                    <td valign="top" align="right">
+                                                                        <a t-if="record.email.raw_value" title="Mail" t-att-href="'mailto:'+record.email.value" style="text-decoration: none;" >
+                                                                            <img src="/web/static/src/img/icons/terp-mail-message-new.png" border="0" width="16" height="16"/>
+                                                                        </a>
+                                                                    </td>
+                                                                </tr>
+                                                            </table>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </t>
+                                    </templates>
+                                </kanban>
+                            </field>
                             </group>
                         </page>
                         <page string="Sales &amp; Purchases" attrs="{'invisible': [('customer', '=', False), ('supplier', '=', False)]}">
                             <separator string="General Information" colspan="4"/>
+                            <field name="lang" colspan="4"/>
                             <field name="user_id"/>
                             <field name="active" groups="base.group_extended"/>
                             <field name="date"/>
@@ -533,7 +513,7 @@
                                     <img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" width="64" height="64" class="oe_module_icon"/>
                                 </a>
                                     <div class="oe_module_desc">
-                                        <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger oe_kanban_color_border">
+                                        <div class="oe_kanban_box_content oe_kanban_box_show_onclick_trigger oe_kanban_color_border">
                                             <table class="oe_kanban_table">
                                                 <tr>
                                                     <td class="oe_kanban_title1" align="left" valign="middle">
@@ -541,7 +521,7 @@
                                                             <div t-if="record.parent_id.raw_value"><field name="parent_id"/></div>
                                                         </h4>
                                                             <i><div t-if="record.contact_address.raw_value"><field name="contact_address"/><br/></div>
-															<div t-if="record.email.raw_value">
+                                                            <div t-if="record.email.raw_value">
                                                             <field name="email"/><br/></div>
                                                             <div t-if="record.mobile.raw_value">
                                                             <field name="mobile"/><br/>
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index c94a8a51e26..313c96a9fb4 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1651,7 +1651,7 @@ class BaseModel(object):
                     children = False
                     views = {}
                     for f in node:
-                        if f.tag in ('form', 'tree', 'graph'):
+                        if f.tag in ('form', 'tree', 'graph', 'kanban'):
                             node.remove(f)
                             ctx = context.copy()
                             ctx['base_model_name'] = self._name