[MERGE] Merged with server/trunk.

bzr revid: tde@openerp.com-20120831073840-4cidj68qd2rubkjs

diff --cc openerp/addons/base/res/res_partner_view.xml
index d98c486,7e70e68..0dab3c4
--- 1/openerp/addons/base/res/res_partner_view.xml
--- 2/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@@ -184,12 -184,15 +184,12 @@@
                                                              <table class="oe_kanban_table">
                                                                  <tr>
                                                                      <td class="oe_kanban_title1" align="left" valign="middle">
-                                                                         <h4><a type="edit"><field name="name"/></a></h4>
+                                                                         <h4><a type="open"><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>
 -
 +                                                                            <field name="function"/></div></i>
 +                                                                        <div><a t-if="record.email.raw_value" title="Mail" t-att-href="'mailto:'+record.email.value">
 +                                                                            <field name="email"/>
 +                                                                        </a></div>
                                                                      </td>
                                                                  </tr>
                                                              </table>