diff --git a/pms/__manifest__.py b/pms/__manifest__.py
index 49c71a9e4..4b317a203 100644
--- a/pms/__manifest__.py
+++ b/pms/__manifest__.py
@@ -89,7 +89,6 @@
         "views/precheckin_portal_templates.xml",
         "wizards/wizard_massive_changes.xml",
         "wizards/wizard_advanced_filters.xml",
-        "views/res_partner_id_category.xml",
         "views/payment_transaction_views.xml",
         "views/account_move_line_views.xml",
         "report/proforma_report_templates.xml",
diff --git a/pms/i18n/es.po b/pms/i18n/es.po
index 7e0bdeb4d..39f4c8a4d 100644
--- a/pms/i18n/es.po
+++ b/pms/i18n/es.po
@@ -10714,7 +10714,6 @@ msgstr "Usuario que creo la ficha"
 msgid "The value of the down payment amount must be positive."
 msgstr "El valor del pago inicial debe ser positivo."
 
-
 #. module: pms
 #: model_terms:ir.ui.view,arch_db:pms.portal_my_folio
 msgid "There are currently no folios for your account."
diff --git a/pms/models/__init__.py b/pms/models/__init__.py
index 4161f104d..144ef07cf 100644
--- a/pms/models/__init__.py
+++ b/pms/models/__init__.py
@@ -46,7 +46,6 @@ from . import pms_availability
 from . import res_partner_id_number
 from . import pms_automated_mails
 from . import payment_transaction
-from . import res_partner_id_category
 from . import pms_team_member
 from . import ir_pms_property
 from . import payment_acquirer
diff --git a/pms/models/res_partner.py b/pms/models/res_partner.py
index db74bec62..abb35f4fc 100644
--- a/pms/models/res_partner.py
+++ b/pms/models/res_partner.py
@@ -124,11 +124,6 @@ class ResPartner(models.Model):
         store=True,
         compute="_compute_lastname2",
     )
-    vat = fields.Char(
-        readonly=False,
-        store=True,
-        compute="_compute_vat",
-    )
     country_id = fields.Many2one(
         readonly=False,
         store=True,
@@ -556,17 +551,6 @@ class ResPartner(models.Model):
             elif not record.lastname2:
                 record.lastname2 = False
 
-    @api.depends("id_numbers", "id_numbers.name")
-    def _compute_vat(self):
-        if hasattr(super(), "_compute_vat"):
-            super()._compute_vat()
-        for record in self:
-            if not record.vat and record.id_numbers:
-                vat = list(filter(None, set(record.id_numbers.mapped("name"))))
-                record.vat = vat[0]
-            elif not record.vat:
-                record.vat = False
-
     @api.depends("residence_country_id")
     def _compute_country_id(self):
         if hasattr(super(), "_compute_country_id"):
@@ -810,9 +794,8 @@ class ResPartner(models.Model):
 
     def _check_enought_invoice_data(self):
         self.ensure_one()
-        if self.vat and self.country_id and self.city and self.street:
-            return True
-        return False
+        # Template to be inherited by localization modules
+        return True
 
     def unlink(self):
         dummy, various_partner_id = self.env["ir.model.data"].get_object_reference(
diff --git a/pms/models/res_partner_id_category.py b/pms/models/res_partner_id_category.py
deleted file mode 100644
index c54ea9488..000000000
--- a/pms/models/res_partner_id_category.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from odoo import fields, models
-
-
-class ResPartnerIdCategory(models.Model):
-    _inherit = "res.partner.id_category"
-
-    is_vat_equivalent = fields.Boolean(
-        string="Is VAT Equivalent",
-        help="If true, this document type is check by vat number",
-        default=False,
-    )
diff --git a/pms/tests/test_pms_folio_invoice.py b/pms/tests/test_pms_folio_invoice.py
index a46a8fcb4..26f5426d5 100644
--- a/pms/tests/test_pms_folio_invoice.py
+++ b/pms/tests/test_pms_folio_invoice.py
@@ -76,7 +76,7 @@ class TestPmsFolioInvoice(TestPms):
         self.partner_id = self.env["res.partner"].create(
             {
                 "name": "Miguel",
-                "vat": "ES123456789",
+                "vat": "45224522J",
                 "country_id": self.env.ref("base.es").id,
                 "city": "Madrid",
                 "zip": "28013",
@@ -719,7 +719,7 @@ class TestPmsFolioInvoice(TestPms):
         self.partner_id2 = self.env["res.partner"].create(
             {
                 "name": "Sara",
-                "vat": "ES123456787",
+                "vat": "54235544A",
                 "country_id": self.env.ref("base.es").id,
                 "city": "Madrid",
                 "zip": "28013",
diff --git a/pms/tests/test_pms_reservation.py b/pms/tests/test_pms_reservation.py
index 371e6beda..0bddf017e 100644
--- a/pms/tests/test_pms_reservation.py
+++ b/pms/tests/test_pms_reservation.py
@@ -2995,10 +2995,14 @@ class TestPmsReservations(TestPms):
         # ACTION
         reservation.action_cancel()
         reservation.flush()
-        expected_price = (
-            self.service.price_total
-            + self.board_service.price_total * reservation.adults
-        ) - reservation.services_discount
+        expected_price = round(
+            (
+                self.service.price_total
+                + self.board_service.price_total * reservation.adults
+            )
+            - reservation.services_discount,
+            2,
+        )
 
         # ASSERT
         self.assertEqual(
diff --git a/pms/views/res_partner_id_category.xml b/pms/views/res_partner_id_category.xml
deleted file mode 100644
index f5ae2792f..000000000
--- a/pms/views/res_partner_id_category.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-    <record id="view_partner_id_category_form" model="ir.ui.view">
-        <field name="model">res.partner.id_category</field>
-        <field
-            name="inherit_id"
-            ref="partner_identification.view_partner_id_category_form"
-        />
-        <field name="arch" type="xml">
-            <xpath expr="//field[@name='code']" position="after">
-               <field name="is_vat_equivalent" />
-            </xpath>
-        </field>
-    </record>
-</odoo>
diff --git a/pms_l10n_es/__manifest__.py b/pms_l10n_es/__manifest__.py
index c37fa700b..d3daeda9a 100644
--- a/pms_l10n_es/__manifest__.py
+++ b/pms_l10n_es/__manifest__.py
@@ -18,6 +18,7 @@
         "partner_contact_nationality",
         "base_iso3166",
         "queue_job",
+        "base_vat",
     ],
     "external_dependencies": {
         "python": [
@@ -42,7 +43,6 @@
         "views/precheckin_portal_templates.xml",
         "wizards/traveller_report.xml",
         "wizards/wizard_ine.xml",
-        "reports/invoice.xml",
     ],
     "installable": True,
 }
diff --git a/pms_l10n_es/data/pms_data.xml b/pms_l10n_es/data/pms_data.xml
index d2a2a896d..25a80a48d 100644
--- a/pms_l10n_es/data/pms_data.xml
+++ b/pms_l10n_es/data/pms_data.xml
@@ -4,7 +4,6 @@
         <record id="document_type_dni" model="res.partner.id_category">
             <field name="name">DNI</field>
             <field name="code">D</field>
-            <field name="is_vat_equivalent">True</field>
             <field name="validation_code">
 letters = {
     0: "T",
@@ -43,5 +42,6 @@ else:
             </field>
 <!--            <field name="has_unique_numbers">True</field>-->
         </record>
+
     </data>
 </odoo>
diff --git a/pms_l10n_es/models/pms_checkin_partner.py b/pms_l10n_es/models/pms_checkin_partner.py
index 394f87ce5..7086da9cf 100644
--- a/pms_l10n_es/models/pms_checkin_partner.py
+++ b/pms_l10n_es/models/pms_checkin_partner.py
@@ -49,7 +49,13 @@ class PmsCheckinParnert(models.Model):
             ]
         )
         if depends or (country and country.code == CODE_SPAIN):
-            mandatory_fields.append("residence_state_id")
+            mandatory_fields.extend(
+                [
+                    "residence_state_id",
+                    "residence_street",
+                    "residence_city",
+                ]
+            )
         return mandatory_fields
 
     @api.model
diff --git a/pms_l10n_es/reports/invoice.xml b/pms_l10n_es/reports/invoice.xml
deleted file mode 100644
index 818916911..000000000
--- a/pms_l10n_es/reports/invoice.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-    <template id="report_invoice_document" inherit_id="account.report_invoice_document">
-        <xpath expr="//div[@t-if='o.partner_id.vat']" position="after">
-            <div
-                t-if="not o.partner_id.vat and o.partner_id.aeat_identification_type"
-                class="mt16"
-            >
-                <t><span t-field="o.partner_id.aeat_identification_type" /></t>: <span
-                    t-field="o.partner_id.aeat_identification"
-                />
-            </div>
-        </xpath>
-    </template>
-</odoo>