From 100b3b22c1dc9d1df27ccae51dbc69d39aa6d935 Mon Sep 17 00:00:00 2001
From: "Florian(flg)" <flg@odoo.com>
Date: Mon, 26 Jun 2023 07:53:49 +0000
Subject: [PATCH] [FIX] l10n_latam_base/l10n_ar: fix vat field in partner view

Latams need more fields for VAT and Odoo Milk broke
how these fields are displayed.

opw-3382698

closes odoo/odoo#126461

X-original-commit: 960d47ccc9db2ae69836a5f1ed7bff163b051a42
Signed-off-by: Brice Bartoletti (bib) <bib@odoo.com>
Signed-off-by: Florian Gilbert (flg) <flg@odoo.com>
---
 addons/l10n_ar/views/res_partner_view.xml     |  8 ++++----
 .../views/res_partner_view.xml                | 19 ++++++++-----------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/addons/l10n_ar/views/res_partner_view.xml b/addons/l10n_ar/views/res_partner_view.xml
index 0b4e0f68a75..3b323ac2235 100644
--- a/addons/l10n_ar/views/res_partner_view.xml
+++ b/addons/l10n_ar/views/res_partner_view.xml
@@ -4,11 +4,11 @@
     <record id="base_view_partner_form" model="ir.ui.view">
         <field name="name">res.partner.form</field>
         <field name="model">res.partner</field>
-        <field name="inherit_id" ref="base.view_partner_form"/>
+        <field name="inherit_id" ref="l10n_latam_base.view_partner_latam_form"/>
         <field name="arch" type="xml">
-            <field name="vat" position="after">
-                <field name="l10n_ar_afip_responsibility_type_id" string="AFIP Responsibility" options="{'no_open': True, 'no_create': True}" attrs="{'readonly': [('parent_id','!=',False)]}"/>
-            </field>
+            <xpath expr="//field[@name='vat']/.." position="after">
+                <field name="l10n_ar_afip_responsibility_type_id" options="{'no_open': True, 'no_create': True}" attrs="{'readonly': [('parent_id','!=',False)]}"/>
+            </xpath>
         </field>
     </record>
 
diff --git a/addons/l10n_latam_base/views/res_partner_view.xml b/addons/l10n_latam_base/views/res_partner_view.xml
index e925faf968a..b1bdf1d52de 100644
--- a/addons/l10n_latam_base/views/res_partner_view.xml
+++ b/addons/l10n_latam_base/views/res_partner_view.xml
@@ -3,21 +3,18 @@
 
     <record id="view_partner_latam_form" model="ir.ui.view">
         <field name="name">view_partner_latam_form</field>
-        <field name="inherit_id" ref="base.view_partner_form"/>
+        <field name="inherit_id" ref="base_vat.view_partner_base_vat_form"/>
         <field name="model">res.partner</field>
         <field name="priority">100</field>
         <field type="xml" name="arch">
-            <field name="vat" position="attributes">
-                <attribute name="invisible">1</attribute>
-            </field>
-            <field name="vat" position="after">
+            <xpath expr="//label[@for='vat']" position="replace">
                 <label for="l10n_latam_identification_type_id" string="Identification Number"/>
-                <div>
-                    <field name="l10n_latam_identification_type_id" options="{'no_open': True, 'no_create': True}" placeholder="Type" attrs="{'readonly': [('parent_id','!=',False)]}" class="oe_inline" domain="country_id and ['|', ('country_id', '=', False), ('country_id', '=', country_id)] or []" required="True"/>
-                    <span class="oe_read_only"> - </span>
-                    <field name="vat" placeholder="Number" class="oe_inline" attrs="{'readonly': [('parent_id','!=',False)]}"/>
-                </div>
-            </field>
+            </xpath>
+            <xpath expr="//field[@name='vat']" position="replace">
+                <field name="l10n_latam_identification_type_id" options="{'no_open': True, 'no_create': True}" placeholder="Type" attrs="{'readonly': [('parent_id','!=',False)]}" class="oe_inline" domain="country_id and ['|', ('country_id', '=', False), ('country_id', '=', country_id)] or []" required="True"/>
+                <span class="oe_read_only"> - </span>
+                <field name="vat" placeholder="Number" class="oe_inline" attrs="{'readonly': [('parent_id','!=',False)]}"/>
+            </xpath>
         </field>
     </record>