From 149c067a10404635a66e8b0fa15c0a8e6fcec036 Mon Sep 17 00:00:00 2001
From: Pouya Malekinejad <poma@odoo.com>
Date: Tue, 15 Mar 2022 12:52:07 +0000
Subject: [PATCH] [FIX] base_vat: use countries VAT label

The module changes VAT label from 'Tax ID' to a fixed value ('VAT'), but there is no reason for it, current use of country defined VAT label works just fine

Task No: (2626863)[https://www.odoo.com/web#id=2626863&cids=1&menu_id=4722&action=4043&model=project.task&view_type=form]

closes odoo/odoo#86445

Related: odoo/upgrade#3376
Signed-off-by: Laurent Smet <las@odoo.com>
---
 addons/base_vat/__manifest__.py             |  2 --
 addons/base_vat/models/res_partner.py       |  2 --
 addons/base_vat/views/res_company_views.xml | 13 -------------
 addons/base_vat/views/res_partner_views.xml | 16 ----------------
 4 files changed, 33 deletions(-)
 delete mode 100644 addons/base_vat/views/res_company_views.xml
 delete mode 100644 addons/base_vat/views/res_partner_views.xml

diff --git a/addons/base_vat/__manifest__.py b/addons/base_vat/__manifest__.py
index 42f3172a10b..c7dab01330b 100644
--- a/addons/base_vat/__manifest__.py
+++ b/addons/base_vat/__manifest__.py
@@ -36,8 +36,6 @@ only the country code will be validated.
     """,
     'depends': ['account'],
     'data': [
-        'views/res_company_views.xml',
-        'views/res_partner_views.xml',
         'views/res_config_settings_views.xml',
     ],
     'license': 'LGPL-3',
diff --git a/addons/base_vat/models/res_partner.py b/addons/base_vat/models/res_partner.py
index bfb66d38018..1cdba70ab11 100644
--- a/addons/base_vat/models/res_partner.py
+++ b/addons/base_vat/models/res_partner.py
@@ -83,8 +83,6 @@ _region_specific_vat_codes = {
 class ResPartner(models.Model):
     _inherit = 'res.partner'
 
-    vat = fields.Char(string="VAT/Tax ID")
-
     def _split_vat(self, vat):
         vat_country, vat_number = vat[:2].lower(), vat[2:].replace(' ', '')
         return vat_country, vat_number
diff --git a/addons/base_vat/views/res_company_views.xml b/addons/base_vat/views/res_company_views.xml
deleted file mode 100644
index f4af1016a00..00000000000
--- a/addons/base_vat/views/res_company_views.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <record id="company_form_vat" model="ir.ui.view">
-        <field name="name">res.company.form.vat.inherit</field>
-        <field name="model">res.company</field>
-        <field name="inherit_id" ref="base.view_company_form"/>
-        <field name="arch" type="xml">
-            <xpath expr="//field[@name='vat']" position="attributes">
-                <attribute name="string">VAT</attribute>
-            </xpath>
-        </field>
-    </record>
-</odoo>
diff --git a/addons/base_vat/views/res_partner_views.xml b/addons/base_vat/views/res_partner_views.xml
deleted file mode 100644
index 31374587957..00000000000
--- a/addons/base_vat/views/res_partner_views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-        <record id="view_partner_form" model="ir.ui.view">
-            <field name="name">res.partner.vat.inherit</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='vat']" position="attributes">
-                    <attribute name="string">VAT</attribute>
-                </xpath>
-                <xpath expr="//span[hasclass('o_vat_label')]" position="replace">
-                    <span class="o_vat_label">VAT</span>
-                </xpath>
-            </field>
-        </record>
-</odoo>