From 5c06d79b69416dec22be0eb0ad5b4d3dbabb8810 Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis.delattre@akretion.com>
Date: Thu, 4 Feb 2021 12:34:01 +0100
Subject: [PATCH] base_partner_one2many_phone: email field on res.partner is
 now really invisible in form view (it was replaced by the mail module)

---
 base_partner_one2many_phone/partner_phone_view.xml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/base_partner_one2many_phone/partner_phone_view.xml b/base_partner_one2many_phone/partner_phone_view.xml
index f1e12bd..f573b2d 100644
--- a/base_partner_one2many_phone/partner_phone_view.xml
+++ b/base_partner_one2many_phone/partner_phone_view.xml
@@ -72,7 +72,9 @@
 <record id="view_partner_form" model="ir.ui.view">
     <field name="name">add.phone_ids.on.partner.form</field>
     <field name="model">res.partner</field>
-    <field name="inherit_id" ref="base.view_partner_form"/>
+    <field name="inherit_id" ref="mail.res_partner_view_form_inherit_mail"/>
+    <!-- This module depends on contacts which depends on mail
+    and the mail module replaces the email field -->
     <field name="arch"  type="xml">
         <field name="phone" position="after">
             <field name="phone_ids" nolabel="1" colspan="2"/>
@@ -83,9 +85,12 @@
         <field name="mobile" position="attributes">
             <attribute name="invisible">1</attribute>
         </field>
-        <field name="email" position="attributes">
+        <label for="email" position="attributes">
             <attribute name="invisible">1</attribute>
-        </field>
+        </label>
+        <xpath expr="//field[@name='email']/.." position="attributes">
+            <attribute name="invisible">1</attribute>
+        </xpath>
         <!-- I can't display phone_ids in the Contacts
              because there is a very strange thing in the web client: if
             you have a res.partner.phone on one of the fields,