diff --git a/README.md b/README.md
index 558f865366d..370ce1457d6 100644
--- a/README.md
+++ b/README.md
@@ -20,9 +20,9 @@ Available addons
 addon | version | summary
 --- | --- | ---
 [multi_pms_properties](multi_pms_properties/) | 14.0.1.0.0 | Multi Properties Manager
-[pms](pms/) | 14.0.2.14.0 | A property management system
+[pms](pms/) | 14.0.2.15.1 | A property management system
 [pms_housekeeping](pms_housekeeping/) | 14.0.1.0.1 | Housekeeping
-[pms_l10n_es](pms_l10n_es/) | 14.0.2.0.0 | PMS Spanish Adaptation
+[pms_l10n_es](pms_l10n_es/) | 14.0.2.0.1 | PMS Spanish Adaptation
 [pms_rooming_xls](pms_rooming_xls/) | 14.0.1.0.0 | Rooming xlsx Management
 
 [//]: # (end addons)
diff --git a/oca_dependencies.txt b/oca_dependencies.txt
index 1017cfa527d..880f634be15 100644
--- a/oca_dependencies.txt
+++ b/oca_dependencies.txt
@@ -2,3 +2,4 @@ partner-contact
 reporting-engine
 queue
 connector
+community-data-files
\ No newline at end of file
diff --git a/pms/__manifest__.py b/pms/__manifest__.py
index 117f50d37f7..f9403bac028 100644
--- a/pms/__manifest__.py
+++ b/pms/__manifest__.py
@@ -4,7 +4,7 @@
 {
     "name": "PMS (Property Management System)",
     "summary": "A property management system",
-    "version": "14.0.2.14.0",
+    "version": "14.0.2.15.1",
     "development_status": "Alpha",
     "category": "Generic Modules/Property Management System",
     "website": "https://github.com/OCA/pms",
diff --git a/pms/i18n/es.po b/pms/i18n/es.po
index 3821e86f5e5..695b0a0dcb2 100644
--- a/pms/i18n/es.po
+++ b/pms/i18n/es.po
@@ -110,7 +110,7 @@ msgstr ""
 "'Order - %s' % (object.name)"
 
 #. module: pms
-#: model_terms:ir.ui.view,arch_db:pms.report_viajero
+#: model_terms:ir.ui.view,arch_db:pms.traveller_report
 msgid ", at"
 msgstr ""
 
@@ -282,7 +282,7 @@ msgid "<strong>Checkout:</strong>"
 msgstr "<strong>Total</strong>"
 
 #. module: pms
-#: model_terms:ir.ui.view,arch_db:pms.report_viajero
+#: model_terms:ir.ui.view,arch_db:pms.traveller_report
 msgid "<strong>Copy for the host</strong>"
 msgstr ""
 
@@ -1176,7 +1176,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:pms.field_pms_property__birthdate_date
 #: model:ir.model.fields,field_description:pms.field_res_partner__birthdate_date
 #: model:ir.model.fields,field_description:pms.field_res_users__birthdate_date
-#: model_terms:ir.ui.view,arch_db:pms.report_viajero
+#: model_terms:ir.ui.view,arch_db:pms.traveller_report
 msgid "Birthdate"
 msgstr ""
 
@@ -1356,7 +1356,7 @@ msgid "By Week"
 msgstr "Por Semana"
 
 #. module: pms
-#: model_terms:ir.ui.view,arch_db:pms.report_viajero
+#: model_terms:ir.ui.view,arch_db:pms.traveller_report
 msgid "CIF:"
 msgstr ""
 
@@ -2700,12 +2700,12 @@ msgid "Document Type"
 msgstr ""
 
 #. module: pms
-#: model_terms:ir.ui.view,arch_db:pms.report_viajero
+#: model_terms:ir.ui.view,arch_db:pms.traveller_report
 msgid "Document number"
 msgstr ""
 
 #. module: pms
-#: model_terms:ir.ui.view,arch_db:pms.report_viajero
+#: model_terms:ir.ui.view,arch_db:pms.traveller_report
 msgid "Document number:"
 msgstr ""
 
@@ -2873,7 +2873,7 @@ msgid "Enter"
 msgstr "Entrada"
 
 #. module: pms
-#: model_terms:ir.ui.view,arch_db:pms.report_viajero
+#: model_terms:ir.ui.view,arch_db:pms.traveller_report
 msgid "Entry date"
 msgstr ""
 
@@ -2898,7 +2898,7 @@ msgid "Exit"
 msgstr "Salida"
 
 #. module: pms
-#: model_terms:ir.ui.view,arch_db:pms.report_viajero
+#: model_terms:ir.ui.view,arch_db:pms.traveller_report
 msgid "Exit date"
 msgstr ""
 
@@ -2908,7 +2908,7 @@ msgid "Expedition Date"
 msgstr ""
 
 #. module: pms
-#: model_terms:ir.ui.view,arch_db:pms.report_viajero
+#: model_terms:ir.ui.view,arch_db:pms.traveller_report
 msgid "Expedition date"
 msgstr ""
 
@@ -3373,7 +3373,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:pms.field_pms_checkin_partner__gender
 #: model:ir.model.fields,field_description:pms.field_pms_property__gender
 #: model:ir.model.fields,field_description:pms.field_res_partner__gender
-#: model_terms:ir.ui.view,arch_db:pms.report_viajero
+#: model_terms:ir.ui.view,arch_db:pms.traveller_report
 msgid "Gender"
 msgstr ""
 
@@ -4595,7 +4595,7 @@ msgstr ""
 "crédito no conciliado o si hace click en el botón \"Listo\"."
 
 #. module: pms
-#: model_terms:ir.ui.view,arch_db:pms.report_viajero
+#: model_terms:ir.ui.view,arch_db:pms.traveller_report
 msgid "Lastnames"
 msgstr ""
 
@@ -4941,7 +4941,7 @@ msgstr "Mis reservas"
 #: model_terms:ir.ui.view,arch_db:pms.availability_view_form
 #: model_terms:ir.ui.view,arch_db:pms.pms_room_view_form
 #: model_terms:ir.ui.view,arch_db:pms.pms_shared_room_view_form
-#: model_terms:ir.ui.view,arch_db:pms.report_viajero
+#: model_terms:ir.ui.view,arch_db:pms.traveller_report
 msgid "Name"
 msgstr "Nombre"
 
@@ -5501,7 +5501,7 @@ msgid "Overbookings"
 msgstr "Overbookings"
 
 #. module: pms
-#: model_terms:ir.ui.view,arch_db:pms.report_viajero
+#: model_terms:ir.ui.view,arch_db:pms.traveller_report
 msgid "PART OF TRAVELERS ENTRY"
 msgstr ""
 
@@ -7907,7 +7907,7 @@ msgid "System Parameter"
 msgstr "Parámetro del sistema"
 
 #. module: pms
-#: model_terms:ir.ui.view,arch_db:pms.report_viajero
+#: model_terms:ir.ui.view,arch_db:pms.traveller_report
 msgid "TRAVELER'S DOCUMENT"
 msgstr ""
 
@@ -8784,7 +8784,7 @@ msgid "Total amount"
 msgstr "Cantidad total"
 
 #. module: pms
-#: model_terms:ir.ui.view,arch_db:pms.report_viajero
+#: model_terms:ir.ui.view,arch_db:pms.traveller_report
 msgid "Total amount (Reservation Card):"
 msgstr ""
 
@@ -8872,7 +8872,7 @@ msgid "Transactions"
 msgstr "Transacciones"
 
 #. module: pms
-#: model_terms:ir.ui.view,arch_db:pms.report_viajero
+#: model_terms:ir.ui.view,arch_db:pms.traveller_report
 msgid "Traveler's signature"
 msgstr ""
 
@@ -8900,7 +8900,7 @@ msgstr "Martes"
 
 #. module: pms
 #: model:ir.model.fields,field_description:pms.field_pms_folio__reservation_type
-#: model_terms:ir.ui.view,arch_db:pms.report_viajero
+#: model_terms:ir.ui.view,arch_db:pms.traveller_report
 msgid "Type"
 msgstr "TIpo"
 
diff --git a/pms/i18n/pms.pot b/pms/i18n/pms.pot
index c4be405d607..806841a451d 100644
--- a/pms/i18n/pms.pot
+++ b/pms/i18n/pms.pot
@@ -102,7 +102,7 @@ msgid ""
 msgstr ""
 
 #. module: pms
-#: model_terms:ir.ui.view,arch_db:pms.report_viajero
+#: model_terms:ir.ui.view,arch_db:pms.traveller_report
 msgid ", at"
 msgstr ""
 
@@ -252,7 +252,7 @@ msgid "<strong>Checkout:</strong>"
 msgstr ""
 
 #. module: pms
-#: model_terms:ir.ui.view,arch_db:pms.report_viajero
+#: model_terms:ir.ui.view,arch_db:pms.traveller_report
 msgid "<strong>Copy for the host</strong>"
 msgstr ""
 
@@ -1088,7 +1088,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:pms.field_pms_property__birthdate_date
 #: model:ir.model.fields,field_description:pms.field_res_partner__birthdate_date
 #: model:ir.model.fields,field_description:pms.field_res_users__birthdate_date
-#: model_terms:ir.ui.view,arch_db:pms.report_viajero
+#: model_terms:ir.ui.view,arch_db:pms.traveller_report
 msgid "Birthdate"
 msgstr ""
 
@@ -1266,7 +1266,7 @@ msgid "By Week"
 msgstr ""
 
 #. module: pms
-#: model_terms:ir.ui.view,arch_db:pms.report_viajero
+#: model_terms:ir.ui.view,arch_db:pms.traveller_report
 msgid "CIF:"
 msgstr ""
 
@@ -1417,6 +1417,11 @@ msgstr ""
 msgid "Channels"
 msgstr ""
 
+#. module: pms
+#: model:ir.model.fields,field_description:pms.field_pms_reservation__check_adults
+msgid "Check Adults"
+msgstr ""
+
 #. module: pms
 #: model:ir.model.fields,field_description:pms.field_pms_reservation__checkin
 #: model:ir.model.fields,field_description:pms.field_pms_reservation_split_join_swap_wizard__checkin
@@ -1627,6 +1632,7 @@ msgstr ""
 
 #. module: pms
 #: model:ir.model.fields,field_description:pms.field_pms_property__city
+#: model_terms:ir.ui.view,arch_db:pms.pms_property_views_form
 msgid "City"
 msgstr ""
 
@@ -1908,6 +1914,7 @@ msgstr ""
 
 #. module: pms
 #: model:ir.model.fields,field_description:pms.field_pms_property__country_id
+#: model_terms:ir.ui.view,arch_db:pms.pms_property_views_form
 msgid "Country"
 msgstr ""
 
@@ -2586,12 +2593,12 @@ msgid "Document Type"
 msgstr ""
 
 #. module: pms
-#: model_terms:ir.ui.view,arch_db:pms.report_viajero
+#: model_terms:ir.ui.view,arch_db:pms.traveller_report
 msgid "Document number"
 msgstr ""
 
 #. module: pms
-#: model_terms:ir.ui.view,arch_db:pms.report_viajero
+#: model_terms:ir.ui.view,arch_db:pms.traveller_report
 msgid "Document number:"
 msgstr ""
 
@@ -2755,7 +2762,7 @@ msgid "Enter"
 msgstr ""
 
 #. module: pms
-#: model_terms:ir.ui.view,arch_db:pms.report_viajero
+#: model_terms:ir.ui.view,arch_db:pms.traveller_report
 msgid "Entry date"
 msgstr ""
 
@@ -2789,7 +2796,7 @@ msgid "Exit"
 msgstr ""
 
 #. module: pms
-#: model_terms:ir.ui.view,arch_db:pms.report_viajero
+#: model_terms:ir.ui.view,arch_db:pms.traveller_report
 msgid "Exit date"
 msgstr ""
 
@@ -2799,7 +2806,7 @@ msgid "Expedition Date"
 msgstr ""
 
 #. module: pms
-#: model_terms:ir.ui.view,arch_db:pms.report_viajero
+#: model_terms:ir.ui.view,arch_db:pms.traveller_report
 msgid "Expedition date"
 msgstr ""
 
@@ -3247,7 +3254,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:pms.field_pms_checkin_partner__gender
 #: model:ir.model.fields,field_description:pms.field_pms_property__gender
 #: model:ir.model.fields,field_description:pms.field_res_partner__gender
-#: model_terms:ir.ui.view,arch_db:pms.report_viajero
+#: model_terms:ir.ui.view,arch_db:pms.traveller_report
 msgid "Gender"
 msgstr ""
 
@@ -3866,6 +3873,11 @@ msgstr ""
 msgid "Internal comment for folio"
 msgstr ""
 
+#. module: pms
+#: model:ir.model.fields,help:pms.field_pms_reservation__check_adults
+msgid "Internal field to force room capacity validations"
+msgstr ""
+
 #. module: pms
 #: model:ir.model.fields,help:pms.field_pms_folio__partner_internal_comment
 #: model:ir.model.fields,help:pms.field_pms_reservation__partner_internal_comment
@@ -4403,7 +4415,7 @@ msgid ""
 msgstr ""
 
 #. module: pms
-#: model_terms:ir.ui.view,arch_db:pms.report_viajero
+#: model_terms:ir.ui.view,arch_db:pms.traveller_report
 msgid "Lastnames"
 msgstr ""
 
@@ -4736,7 +4748,7 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:pms.availability_view_form
 #: model_terms:ir.ui.view,arch_db:pms.pms_room_view_form
 #: model_terms:ir.ui.view,arch_db:pms.pms_shared_room_view_form
-#: model_terms:ir.ui.view,arch_db:pms.report_viajero
+#: model_terms:ir.ui.view,arch_db:pms.traveller_report
 msgid "Name"
 msgstr ""
 
@@ -5282,7 +5294,7 @@ msgid "Overbookings"
 msgstr ""
 
 #. module: pms
-#: model_terms:ir.ui.view,arch_db:pms.report_viajero
+#: model_terms:ir.ui.view,arch_db:pms.traveller_report
 msgid "PART OF TRAVELERS ENTRY"
 msgstr ""
 
@@ -5550,13 +5562,7 @@ msgid "Persons"
 msgstr ""
 
 #. module: pms
-#: code:addons/pms/models/pms_reservation_line.py:0
-#, python-format
-msgid "Persons can't be higher than room capacity"
-msgstr ""
-
-#. module: pms
-#: code:addons/pms/models/pms_reservation.py:0
+#: code:addons/pms/models/pms_room.py:0
 #, python-format
 msgid "Persons can't be higher than room capacity (%s)"
 msgstr ""
@@ -7500,6 +7506,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:pms.field_res_partner__state_id
 #: model:ir.model.fields,field_description:pms.field_res_users__state_id
 #: model_terms:ir.ui.view,arch_db:pms.pms_checkin_partner_view_search
+#: model_terms:ir.ui.view,arch_db:pms.pms_property_views_form
 #: model_terms:ir.ui.view,arch_db:pms.pms_reservation_view_search
 msgid "State"
 msgstr ""
@@ -7549,6 +7556,16 @@ msgstr ""
 msgid "Street"
 msgstr ""
 
+#. module: pms
+#: model_terms:ir.ui.view,arch_db:pms.pms_property_views_form
+msgid "Street 2..."
+msgstr ""
+
+#. module: pms
+#: model_terms:ir.ui.view,arch_db:pms.pms_property_views_form
+msgid "Street..."
+msgstr ""
+
 #. module: pms
 #: model:ir.model.fields,field_description:pms.field_pms_property__street2
 msgid "Street2"
@@ -7624,7 +7641,7 @@ msgid "System Parameter"
 msgstr ""
 
 #. module: pms
-#: model_terms:ir.ui.view,arch_db:pms.report_viajero
+#: model_terms:ir.ui.view,arch_db:pms.traveller_report
 msgid "TRAVELER'S DOCUMENT"
 msgstr ""
 
@@ -8424,7 +8441,7 @@ msgid "Total amount"
 msgstr ""
 
 #. module: pms
-#: model_terms:ir.ui.view,arch_db:pms.report_viajero
+#: model_terms:ir.ui.view,arch_db:pms.traveller_report
 msgid "Total amount (Reservation Card):"
 msgstr ""
 
@@ -8503,7 +8520,7 @@ msgid "Transactions"
 msgstr ""
 
 #. module: pms
-#: model_terms:ir.ui.view,arch_db:pms.report_viajero
+#: model_terms:ir.ui.view,arch_db:pms.traveller_report
 msgid "Traveler's signature"
 msgstr ""
 
@@ -8532,7 +8549,7 @@ msgstr ""
 #. module: pms
 #: model:ir.model.fields,field_description:pms.field_pms_booking_engine__reservation_type
 #: model:ir.model.fields,field_description:pms.field_pms_folio__reservation_type
-#: model_terms:ir.ui.view,arch_db:pms.report_viajero
+#: model_terms:ir.ui.view,arch_db:pms.traveller_report
 msgid "Type"
 msgstr ""
 
@@ -8920,6 +8937,11 @@ msgstr ""
 msgid "You must assign a customer name"
 msgstr ""
 
+#. module: pms
+#: model_terms:ir.ui.view,arch_db:pms.pms_property_views_form
+msgid "ZIP"
+msgstr ""
+
 #. module: pms
 #: model:ir.model.fields,field_description:pms.field_pms_property__zip
 msgid "Zip"
diff --git a/pms/models/pms_reservation.py b/pms/models/pms_reservation.py
index 38a3e006054..b24fc967550 100644
--- a/pms/models/pms_reservation.py
+++ b/pms/models/pms_reservation.py
@@ -342,7 +342,6 @@ class PmsReservation(models.Model):
     reservation_type = fields.Selection(
         string="Reservation Type",
         help="Type of reservations. It can be 'normal', 'staff' or 'out of service",
-        default=lambda *a: "normal",
         related="folio_id.reservation_type",
         store=True,
         readonly=False,
@@ -605,6 +604,29 @@ class PmsReservation(models.Model):
         readonly=False,
     )
 
+    check_adults = fields.Boolean(
+        help="Internal field to force room capacity validations",
+        compute="_compute_check_adults",
+        readonly=False,
+        store=True,
+    )
+
+    def _compute_date_order(self):
+        for record in self:
+            record.date_order = datetime.datetime.today()
+
+    @api.depends(
+        "service_ids",
+        "service_ids.service_line_ids",
+        "service_ids.service_line_ids.product_id",
+        "service_ids.service_line_ids.day_qty",
+        "reservation_line_ids",
+        "reservation_line_ids.room_id",
+    )
+    def _compute_check_adults(self):
+        for record in self:
+            record.check_adults = True
+
     @api.depends(
         "checkin",
         "checkout",
@@ -1423,23 +1445,6 @@ def check_consecutive_dates(self):
     #                 _("The room already is completed (%s)", record.name)
     #             )
 
-    @api.constrains("adults")
-    def _check_adults(self):
-        for record in self:
-            extra_bed = record.service_ids.filtered(
-                lambda r: r.product_id.is_extra_bed is True
-            )
-            for room in record.reservation_line_ids.room_id:
-                if record.adults + record.children_occupying > room.get_capacity(
-                    sum(extra_bed.mapped("product_qty"))
-                ):
-                    raise ValidationError(
-                        _(
-                            "Persons can't be higher than room capacity (%s)",
-                            record.name,
-                        )
-                    )
-
     @api.constrains("state")
     def _check_onboard_reservation(self):
         for record in self:
@@ -1484,6 +1489,13 @@ def _no_agency_as_agency(self):
             if record.agency_id and not record.agency_id.is_agency:
                 raise ValidationError(_("booking agency with wrong configuration: "))
 
+    @api.constrains("check_adults")
+    def _check_capacity(self):
+        for record in self:
+            self.env["pms.room"]._check_adults(
+                record, record.service_ids.service_line_ids
+            )
+
     # Action methods
     def open_partner(self):
         """ Utility method used to add an "View Customer" button in reservation views """
@@ -1623,6 +1635,12 @@ def create(self, vals):
             )
             pms_property = self.env["pms.property"].browse(pms_property_id)
             vals["name"] = pms_property.reservation_sequence_id._next_do()
+
+        if not vals.get("reservation_type"):
+            vals["reservation_type"] = (
+                folio.reservation_type if folio.reservation_type else "normal"
+            )
+
         record = super(PmsReservation, self).create(vals)
         if record.preconfirm:
             record.confirm()
diff --git a/pms/models/pms_reservation_line.py b/pms/models/pms_reservation_line.py
index 3d5e2b641b7..6331997fae4 100644
--- a/pms/models/pms_reservation_line.py
+++ b/pms/models/pms_reservation_line.py
@@ -470,17 +470,3 @@ def constrains_duplicated_date(self):
             )
             if duplicated:
                 raise ValidationError(_("Duplicated reservation line date"))
-
-    @api.constrains("room_id")
-    def _check_adults(self):
-        for record in self.filtered("room_id"):
-            extra_bed = record.reservation_id.service_ids.filtered(
-                lambda r: r.product_id.is_extra_bed is True
-            )
-            if (
-                record.reservation_id.adults + record.reservation_id.children_occupying
-                > record.room_id.get_capacity(len(extra_bed))
-            ):
-                raise ValidationError(_("Persons can't be higher than room capacity"))
-            # if record.reservation_id.adults == 0:
-            #    raise ValidationError(_("Reservation has no adults"))
diff --git a/pms/models/pms_room.py b/pms/models/pms_room.py
index e83742eac7b..dcb6869a052 100644
--- a/pms/models/pms_room.py
+++ b/pms/models/pms_room.py
@@ -118,6 +118,26 @@ def _check_capacity(self):
                     )
                 )
 
+    @api.model
+    def _check_adults(self, reservation, service_line_ids=False):
+        for line in reservation.reservation_line_ids:
+            num_extra_beds = 0
+            if service_line_ids:
+                extra_beds = service_line_ids.filtered(
+                    lambda x: x.date == line.date and x.product_id.is_extra_bed is True
+                )
+                num_extra_beds = sum(extra_beds.mapped("day_qty")) if extra_beds else 0
+            if line.room_id:
+                if (
+                    reservation.adults + reservation.children_occupying
+                ) > line.room_id.get_capacity(num_extra_beds):
+                    raise ValidationError(
+                        _(
+                            "Persons can't be higher than room capacity (%s)",
+                            reservation.name,
+                        )
+                    )
+
     # Business methods
 
     def get_capacity(self, extra_bed=0):
diff --git a/pms/models/pms_service.py b/pms/models/pms_service.py
index 858c0cfa72b..af621271ae6 100644
--- a/pms/models/pms_service.py
+++ b/pms/models/pms_service.py
@@ -340,23 +340,24 @@ def _compute_service_line_ids(self):
                         move_day = 0
                         if consumed_on == "after":
                             move_day = 1
-                        service.service_line_ids -= (
-                            service.service_line_ids.filtered_domain(
-                                [
-                                    "|",
-                                    (
-                                        "date",
-                                        "<",
-                                        reservation.checkin + timedelta(move_day),
-                                    ),
-                                    (
-                                        "date",
-                                        ">=",
-                                        reservation.checkout + timedelta(move_day),
-                                    ),
-                                ]
-                            )
-                        )
+                        for del_service_id in service.service_line_ids.filtered_domain(
+                            [
+                                "|",
+                                (
+                                    "date",
+                                    "<",
+                                    reservation.checkin + timedelta(move_day),
+                                ),
+                                (
+                                    "date",
+                                    ">=",
+                                    reservation.checkout + timedelta(move_day),
+                                ),
+                            ]
+                        ).ids:
+                            lines.append((2, del_service_id))
+                        # TODO: check intermediate states in check_adults restriction
+                        #   when lines are removed
                         service.service_line_ids = lines
                     else:
                         if not service.service_line_ids:
@@ -535,10 +536,11 @@ def _get_real_price_currency(self, product, rule_id, qty, uom, pricelist_id):
     # Businness Methods
     def _service_day_qty(self):
         self.ensure_one()
-        qty = self.product_qty if len(self.service_line_ids) == 1 else 0
+        qty = self.product_qty if len(self.service_line_ids) == 1 else 1
         if not self.reservation_id:
             return qty
         # TODO: Pass per_person to service line from product default_per_person
+        #   When the user modifies the quantity avoid overwriting
         if self.product_id.per_person:
             qty = self.reservation_id.adults
         return qty
diff --git a/pms/report/traveller_report_action.xml b/pms/report/traveller_report_action.xml
index 17388a536d2..f04c2bbdfb5 100644
--- a/pms/report/traveller_report_action.xml
+++ b/pms/report/traveller_report_action.xml
@@ -5,8 +5,8 @@
             <field name="name">Traveller Report</field>
             <field name="model">pms.checkin.partner</field>
             <field name="report_type">qweb-pdf</field>
-            <field name="report_name">pms.report_viajero</field>
-            <field name="report_file">pms.report_viajero</field>
+            <field name="report_name">pms.traveller_report</field>
+            <field name="report_file">pms.traveller_report</field>
             <field name="paperformat_id" ref="traveller_report_paperformat" />
             <field
                 name="print_report_name"
diff --git a/pms/tests/test_pms_folio_invoice.py b/pms/tests/test_pms_folio_invoice.py
index 67754d22b5f..c64412a1734 100644
--- a/pms/tests/test_pms_folio_invoice.py
+++ b/pms/tests/test_pms_folio_invoice.py
@@ -1,36 +1,12 @@
 import datetime
 
-from odoo.tests import common
+from .common import TestPms
 
 
-class TestPmsFolioInvoice(common.SavepointCase):
+class TestPmsFolioInvoice(TestPms):
     def setUp(self):
-        super(TestPmsFolioInvoice, self).setUp()
-        # create a room type availability and sequences
-        self.folio_sequence = self.env["ir.sequence"].create(
-            {
-                "name": "PMS Folio",
-                "code": "pms.folio",
-                "padding": 4,
-                "company_id": self.env.ref("base.main_company").id,
-            }
-        )
-        self.reservation_sequence = self.env["ir.sequence"].create(
-            {
-                "name": "PMS Reservation",
-                "code": "pms.reservation",
-                "padding": 4,
-                "company_id": self.env.ref("base.main_company").id,
-            }
-        )
-        self.checkin_sequence = self.env["ir.sequence"].create(
-            {
-                "name": "PMS Checkin",
-                "code": "pms.checkin.partner",
-                "padding": 4,
-                "company_id": self.env.ref("base.main_company").id,
-            }
-        )
+        super().setUp()
+        # create a room type availability
         self.room_type_availability = self.env["pms.availability.plan"].create(
             {"name": "Availability plan for TEST"}
         )
@@ -39,16 +15,9 @@ def setUp(self):
             {
                 "name": "MY PMS TEST",
                 "company_id": self.env.ref("base.main_company").id,
-                "default_pricelist_id": self.env.ref("product.list0").id,
-                "folio_sequence_id": self.folio_sequence.id,
-                "reservation_sequence_id": self.reservation_sequence.id,
-                "checkin_sequence_id": self.checkin_sequence.id,
+                "default_pricelist_id": self.pricelist1.id,
             }
         )
-        # create room type class
-        self.room_type_class = self.env["pms.room.type.class"].create(
-            {"name": "Room", "default_code": "ROOM"}
-        )
 
         # create room type
         self.room_type_double = self.env["pms.room.type"].create(
@@ -56,7 +25,7 @@ def setUp(self):
                 "pms_property_ids": [self.property.id],
                 "name": "Double Test",
                 "default_code": "DBL_Test",
-                "class_id": self.room_type_class.id,
+                "class_id": self.room_type_class1.id,
                 "price": 25,
             }
         )
@@ -88,9 +57,23 @@ def setUp(self):
                 "capacity": 2,
             }
         )
-        self.demo_user = self.env.ref("base.user_admin")
+
+        # res.partner
+        self.partner_id = self.env["res.partner"].create(
+            {
+                "name": "Miguel",
+            }
+        )
 
     def test_invoice_full_folio(self):
+        """
+        Check that when launching the create_invoices() method for a full folio,
+        the invoice_status field is set to "invoiced".
+        ----------------
+        A reservation is created. The create_invoices() method of the folio of
+        that reservation is launched. It is verified that the invoice_status field
+        of the folio is equal to "invoiced".
+        """
         # ARRANGE
         r1 = self.env["pms.reservation"].create(
             {
@@ -99,12 +82,9 @@ def test_invoice_full_folio(self):
                 "checkout": datetime.datetime.now() + datetime.timedelta(days=3),
                 "adults": 2,
                 "room_type_id": self.room_type_double.id,
-                "partner_id": self.env.ref("base.res_partner_12").id,
+                "partner_id": self.partner_id.id,
             }
         )
-        r1.flush()
-        r1.folio_id.flush()
-        r1.folio_id.sale_line_ids.flush()
         state_expected = "invoiced"
         # ACT
         r1.folio_id._create_invoices()
@@ -116,6 +96,14 @@ def test_invoice_full_folio(self):
         )
 
     def test_invoice_partial_folio_by_steps(self):
+        """
+        Check that when launching the create_invoices() method for a partial folio,
+        the invoice_status field is set to "invoiced".
+        ----------------
+        A reservation is created. The create_invoices() method of the folio of
+        that reservation is launched with the first sale line. It is verified
+        that the invoice_status field of the folio is equal to "invoiced".
+        """
         # ARRANGE
         r1 = self.env["pms.reservation"].create(
             {
@@ -124,29 +112,14 @@ def test_invoice_partial_folio_by_steps(self):
                 "checkout": datetime.datetime.now() + datetime.timedelta(days=3),
                 "adults": 2,
                 "room_type_id": self.room_type_double.id,
-                "partner_id": self.env.ref("base.res_partner_12").id,
+                "partner_id": self.partner_id.id,
             }
         )
         dict_lines = dict()
-        # qty to 1 to 1st folio sale line
-        dict_lines[
-            r1.folio_id.sale_line_ids.filtered(lambda l: not l.display_type)[0].id
-        ] = 1
-        r1.folio_id._create_invoices(lines_to_invoice=dict_lines)
 
-        # test does not work without invalidating cache
-        self.env["account.move"].invalidate_cache()
-
-        self.assertNotEqual(
-            "invoiced",
-            r1.folio_id.invoice_status,
-            "The status after a partial invoicing is not correct",
-        )
-
-        # qty to 2 to 1st folio sale line
         dict_lines[
             r1.folio_id.sale_line_ids.filtered(lambda l: not l.display_type)[0].id
-        ] = 2
+        ] = 3
         r1.folio_id._create_invoices(lines_to_invoice=dict_lines)
 
         self.assertEqual(
@@ -164,7 +137,7 @@ def test_invoice_partial_folio_diferent_partners(self):
                 "checkout": datetime.datetime.now() + datetime.timedelta(days=3),
                 "adults": 2,
                 "room_type_id": self.room_type_double.id,
-                "partner_id": self.env.ref("base.res_partner_12").id,
+                "partner_id": self.partner_id.id,
             }
         )
         dict_lines = dict()
@@ -201,6 +174,13 @@ def test_invoice_partial_folio_diferent_partners(self):
         )
 
     def test_invoice_partial_folio_wrong_qtys(self):
+        """
+        Check that an invoice of a folio with wrong amounts cannot be created.
+        ------------
+        A reservation is created. Then the create_invoices method of the folio
+        is launched with the lines to be invoiced with wrong amounts and through
+        subtest it is verified that the invoices cannot be created.
+        """
         # ARRANGE
         r1 = self.env["pms.reservation"].create(
             {
@@ -228,22 +208,376 @@ def test_invoice_partial_folio_wrong_qtys(self):
                     # test does not work without invalidating cache
                     self.env["account.move"].invalidate_cache()
 
-    # TODO: complete tests
-    def _test_invoice_folio(self):
-        """Test create and invoice from the Folio, and check qty invoice/to invoice,
-        and the related amounts"""
+    def test_amount_invoice_folio(self):
+        """
+        Test create and invoice from the Folio, and check amount of the reservation.
+        -------------
+        A reservation is created. The create_invoices() method is launched and it is
+        verified that the total amount of the reservation folio is equal to the total
+        of the created invoice.
+        """
+        r1 = self.env["pms.reservation"].create(
+            {
+                "pms_property_id": self.property.id,
+                "checkin": datetime.datetime.now(),
+                "checkout": datetime.datetime.now() + datetime.timedelta(days=3),
+                "adults": 2,
+                "room_type_id": self.room_type_double.id,
+                "partner_id": self.partner_id.id,
+            }
+        )
 
-    def _test_invoice_by_days_folio(self):
-        """Test create and invoice from the Folio, and check qty invoice/to invoice,
-        and the related amounts in a specific segment of days (reservation lines)"""
+        total_amount_expected = r1.folio_id.amount_total
+        r1.folio_id._create_invoices()
+        self.assertEqual(
+            r1.folio_id.move_ids.amount_total,
+            total_amount_expected,
+            "Total amount of the invoice and total amount of folio don't match",
+        )
 
-    def _test_invoice_by_services_folio(self):
-        """Test create and invoice from the Folio, and check qty invoice/to invoice,
-        and the related amounts in a specific segment of services (qtys)"""
+    def test_qty_to_invoice_folio(self):
+        """
+        Test create and invoice from the Folio, and check qty to invoice.
+        ----------------------
+        A reservation is created.Then it is verified that the total quantity
+        to be invoice from the sale lines of the reservation folio corresponds
+        to expected.
+        """
+        r1 = self.env["pms.reservation"].create(
+            {
+                "pms_property_id": self.property.id,
+                "checkin": datetime.datetime.now(),
+                "checkout": datetime.datetime.now() + datetime.timedelta(days=3),
+                "adults": 2,
+                "room_type_id": self.room_type_double.id,
+                "partner_id": self.partner_id.id,
+            }
+        )
+        qty_to_invoice_expected = sum(
+            r1.folio_id.sale_line_ids.mapped("qty_to_invoice")
+        )
+        self.assertEqual(
+            qty_to_invoice_expected,
+            3.0,
+            "The quantity to be invoice on the folio does not correspond",
+        )
 
-    def _test_invoice_board_service(self):
-        """Test create and invoice from the Folio, and check qty invoice/to invoice,
-        and the related amounts with board service linked"""
+    def test_qty_invoiced_folio(self):
+        """
+        Test create and invoice from the Folio, and check qty invoiced.
+        ---------------
+        A reservation is created.The create_invoices() method is launched and it is
+        verified that the total quantity invoiced of the reservation folio is equal
+        to the total quantity of the created invoice.
+        """
+        r1 = self.env["pms.reservation"].create(
+            {
+                "pms_property_id": self.property.id,
+                "checkin": datetime.datetime.now(),
+                "checkout": datetime.datetime.now() + datetime.timedelta(days=3),
+                "adults": 2,
+                "room_type_id": self.room_type_double.id,
+                "partner_id": self.partner_id.id,
+            }
+        )
+        r1.folio_id._create_invoices()
+        qty_invoiced_expected = sum(r1.folio_id.sale_line_ids.mapped("qty_invoiced"))
+        self.assertEqual(
+            qty_invoiced_expected,
+            3.0,
+            "The quantity invoiced on the folio does not correspond",
+        )
+
+    def test_price_invoice_by_services_folio(self):
+        """
+        Test create and invoice from the Folio, and check amount in a
+        specific segment of services.
+        """
+
+        self.product1 = self.env["product.product"].create(
+            {"name": "Test Product 1", "per_day": True, "list_price": 10}
+        )
+
+        self.service1 = self.env["pms.service"].create(
+            {
+                "is_board_service": False,
+                "product_id": self.product1.id,
+            }
+        )
+
+        self.reservation1 = self.env["pms.reservation"].create(
+            {
+                "pms_property_id": self.property.id,
+                "checkin": datetime.datetime.now(),
+                "checkout": datetime.datetime.now() + datetime.timedelta(days=3),
+                "adults": 2,
+                "room_type_id": self.room_type_double.id,
+                "partner_id": self.partner_id.id,
+                "service_ids": [(6, 0, [self.service1.id])],
+            }
+        )
+        dict_lines = dict()
+        dict_lines[
+            self.reservation1.folio_id.sale_line_ids.filtered("service_id")[0].id
+        ] = 1
+        self.reservation1.folio_id._create_invoices(lines_to_invoice=dict_lines)
+        self.assertEqual(
+            self.reservation1.folio_id.sale_line_ids.filtered("service_id")[
+                0
+            ].price_total,
+            self.reservation1.folio_id.move_ids.amount_total,
+            "The service price don't match between folio and invoice",
+        )
+
+    def test_qty_invoiced_by_services_folio(self):
+        """
+        Test create and invoice from the Folio, and check qty invoiced
+        in a specific segment of services
+        """
+
+        self.product1 = self.env["product.product"].create(
+            {"name": "Test Product 1", "per_day": True, "list_price": 10}
+        )
+
+        self.service1 = self.env["pms.service"].create(
+            {
+                "is_board_service": False,
+                "product_id": self.product1.id,
+            }
+        )
+
+        self.reservation1 = self.env["pms.reservation"].create(
+            {
+                "pms_property_id": self.property.id,
+                "checkin": datetime.datetime.now(),
+                "checkout": datetime.datetime.now() + datetime.timedelta(days=3),
+                "adults": 2,
+                "room_type_id": self.room_type_double.id,
+                "partner_id": self.partner_id.id,
+                "service_ids": [(6, 0, [self.service1.id])],
+            }
+        )
+        dict_lines = dict()
+        service_lines = self.reservation1.folio_id.sale_line_ids.filtered("service_id")
+        for line in service_lines:
+            dict_lines[line.id] = 1
+            self.reservation1.folio_id._create_invoices(lines_to_invoice=dict_lines)
+        expected_qty_invoiced = sum(
+            self.reservation1.folio_id.move_ids.invoice_line_ids.mapped("quantity")
+        )
+        self.assertEqual(
+            expected_qty_invoiced,
+            sum(self.reservation1.folio_id.sale_line_ids.mapped("qty_invoiced")),
+            "The quantity of invoiced services don't match between folio and invoice",
+        )
+
+    def test_qty_to_invoice_by_services_folio(self):
+        """
+        Test create an invoice from the Folio, and check qty to invoice
+        in a specific segment of services
+        """
+
+        self.product1 = self.env["product.product"].create(
+            {"name": "Test Product 1", "per_day": True, "list_price": 10}
+        )
+
+        self.service1 = self.env["pms.service"].create(
+            {
+                "is_board_service": False,
+                "product_id": self.product1.id,
+            }
+        )
+
+        self.reservation1 = self.env["pms.reservation"].create(
+            {
+                "pms_property_id": self.property.id,
+                "checkin": datetime.datetime.now(),
+                "checkout": datetime.datetime.now() + datetime.timedelta(days=3),
+                "adults": 2,
+                "room_type_id": self.room_type_double.id,
+                "partner_id": self.partner_id.id,
+                "service_ids": [(6, 0, [self.service1.id])],
+            }
+        )
+        expected_qty_to_invoice = sum(
+            self.reservation1.folio_id.sale_line_ids.filtered("service_id").mapped(
+                "qty_to_invoice"
+            )
+        )
+        self.assertEqual(
+            expected_qty_to_invoice,
+            3.0,
+            "The quantity of services to be invoice is wrong",
+        )
+
+    def test_price_invoice_board_service(self):
+        """
+        Test create and invoice from the Folio, and check the related
+        amounts with board service linked
+        """
+        self.product1 = self.env["product.product"].create(
+            {
+                "name": "Test Product 1",
+            }
+        )
+
+        self.board_service1 = self.env["pms.board.service"].create(
+            {
+                "name": "Test Board Service 1",
+                "default_code": "CB1",
+            }
+        )
+        self.board_service_line1 = self.env["pms.board.service.line"].create(
+            {
+                "product_id": self.product1.id,
+                "pms_board_service_id": self.board_service1.id,
+                "amount": 10,
+            }
+        )
+
+        self.board_service_room_type1 = self.env["pms.board.service.room.type"].create(
+            {
+                "pms_room_type_id": self.room_type_double.id,
+                "pms_board_service_id": self.board_service1.id,
+            }
+        )
+        self.reservation1 = self.env["pms.reservation"].create(
+            {
+                "pms_property_id": self.property.id,
+                "checkin": datetime.datetime.now(),
+                "checkout": datetime.datetime.now() + datetime.timedelta(days=3),
+                "adults": 2,
+                "room_type_id": self.room_type_double.id,
+                "partner_id": self.partner_id.id,
+                "board_service_room_id": self.board_service_room_type1.id,
+            }
+        )
+        dict_lines = dict()
+        dict_lines[
+            self.reservation1.folio_id.sale_line_ids.filtered("service_id")[0].id
+        ] = 1
+        self.reservation1.folio_id._create_invoices(lines_to_invoice=dict_lines)
+        self.assertEqual(
+            self.reservation1.folio_id.sale_line_ids.filtered("service_id")[
+                0
+            ].price_total,
+            self.reservation1.folio_id.move_ids.amount_total,
+            "The board service price don't match between folio and invoice",
+        )
+
+    def test_qty_invoiced_board_service(self):
+        """
+        Test create and invoice from the Folio, and check qty invoiced
+        with board service linked.
+        """
+        self.product1 = self.env["product.product"].create(
+            {
+                "name": "Test Product 1",
+            }
+        )
+
+        self.board_service1 = self.env["pms.board.service"].create(
+            {
+                "name": "Test Board Service 1",
+                "default_code": "CB1",
+            }
+        )
+        self.board_service_line1 = self.env["pms.board.service.line"].create(
+            {
+                "product_id": self.product1.id,
+                "pms_board_service_id": self.board_service1.id,
+                "amount": 10,
+            }
+        )
+
+        self.board_service_room_type1 = self.env["pms.board.service.room.type"].create(
+            {
+                "pms_room_type_id": self.room_type_double.id,
+                "pms_board_service_id": self.board_service1.id,
+            }
+        )
+        self.reservation1 = self.env["pms.reservation"].create(
+            {
+                "pms_property_id": self.property.id,
+                "checkin": datetime.datetime.now(),
+                "checkout": datetime.datetime.now() + datetime.timedelta(days=3),
+                "adults": 2,
+                "room_type_id": self.room_type_double.id,
+                "partner_id": self.partner_id.id,
+                "board_service_room_id": self.board_service_room_type1.id,
+            }
+        )
+        dict_lines = dict()
+        service_lines = self.reservation1.folio_id.sale_line_ids.filtered("service_id")
+        for line in service_lines:
+            dict_lines[line.id] = 1
+            self.reservation1.folio_id._create_invoices(lines_to_invoice=dict_lines)
+        expected_qty_invoiced = sum(
+            self.reservation1.folio_id.move_ids.invoice_line_ids.mapped("quantity")
+        )
+        self.assertEqual(
+            expected_qty_invoiced,
+            sum(self.reservation1.folio_id.sale_line_ids.mapped("qty_invoiced")),
+            "The quantity of invoiced board services don't match between folio and invoice",
+        )
+
+    def test_qty_to_invoice_board_service(self):
+        """
+        Test create and invoice from the Folio, and check qty to invoice
+        with board service linked
+        """
+        self.product1 = self.env["product.product"].create(
+            {
+                "name": "Test Product 1",
+            }
+        )
+
+        self.board_service1 = self.env["pms.board.service"].create(
+            {
+                "name": "Test Board Service 1",
+                "default_code": "CB1",
+            }
+        )
+        self.board_service_line1 = self.env["pms.board.service.line"].create(
+            {
+                "product_id": self.product1.id,
+                "pms_board_service_id": self.board_service1.id,
+                "amount": 10,
+            }
+        )
+
+        self.board_service_room_type1 = self.env["pms.board.service.room.type"].create(
+            {
+                "pms_room_type_id": self.room_type_double.id,
+                "pms_board_service_id": self.board_service1.id,
+            }
+        )
+        self.reservation1 = self.env["pms.reservation"].create(
+            {
+                "pms_property_id": self.property.id,
+                "checkin": datetime.datetime.now(),
+                "checkout": datetime.datetime.now() + datetime.timedelta(days=3),
+                "adults": 2,
+                "room_type_id": self.room_type_double.id,
+                "partner_id": self.partner_id.id,
+                "board_service_room_id": self.board_service_room_type1.id,
+            }
+        )
+        dict_lines = dict()
+        service_lines = self.reservation1.folio_id.sale_line_ids.filtered("service_id")
+        for line in service_lines:
+            dict_lines[line.id] = 1
+            self.reservation1.folio_id._create_invoices(lines_to_invoice=dict_lines)
+        expected_qty_to_invoice = sum(
+            self.reservation1.folio_id.sale_line_ids.filtered("service_id").mapped(
+                "qty_to_invoice"
+            )
+        )
+        self.assertEqual(
+            expected_qty_to_invoice,
+            0,
+            "The quantity of board services to be invoice is wrong",
+        )
 
     def _test_invoice_line_group_by_room_type_sections(self):
         """Test create and invoice from the Folio, and check qty invoice/to invoice,
diff --git a/pms/tests/test_pms_reservation.py b/pms/tests/test_pms_reservation.py
index 6557b1dfeb7..296b2112d7f 100644
--- a/pms/tests/test_pms_reservation.py
+++ b/pms/tests/test_pms_reservation.py
@@ -36,6 +36,7 @@ def setUp(self):
                 "name": "Double 101",
                 "room_type_id": self.room_type_double.id,
                 "capacity": 2,
+                "extra_beds_allowed": 1,
             }
         )
 
@@ -626,19 +627,20 @@ def test_manage_children_raise(self):
         # ACT & ASSERT
         with self.assertRaises(
             ValidationError,
-            msg="The number of people is lower than the capacity of the room",
+            msg="The number of people is greater than the capacity of the room",
         ):
-            self.env["pms.reservation"].create(
+            reservation = self.env["pms.reservation"].create(
                 {
                     "adults": 2,
                     "children_occupying": 1,
                     "checkin": datetime.datetime.now(),
                     "checkout": datetime.datetime.now() + datetime.timedelta(days=1),
-                    "room_type_id": self.room_type_double.id,
+                    "preferred_room_id": self.room1.id,
                     "partner_id": self.partner1.id,
                     "pms_property_id": self.pms_property1.id,
                 }
             )
+            reservation.flush()
 
     def test_to_assign_priority_reservation(self):
         """
@@ -1930,16 +1932,17 @@ def test_check_more_adults_than_beds(self):
             }
         )
         with self.assertRaises(ValidationError):
-            self.env["pms.reservation"].create(
+            reservation = self.env["pms.reservation"].create(
                 {
                     "checkin": fields.date.today(),
                     "checkout": fields.date.today() + datetime.timedelta(days=3),
                     "pms_property_id": self.pms_property1.id,
                     "partner_id": self.host1.id,
-                    "room_type_id": self.room_type_double.id,
+                    "preferred_room_id": self.room1.id,
                     "adults": 4,
                 }
             )
+            reservation.flush()
 
     def test_check_format_arrival_hour(self):
         """
@@ -2616,7 +2619,7 @@ def test_cancel_discount_service(self):
             {
                 "checkin": fields.date.today() + datetime.timedelta(days=-3),
                 "checkout": fields.date.today() + datetime.timedelta(days=3),
-                "room_type_id": self.room_type_double.id,
+                "preferred_room_id": self.room1.id,
                 "partner_id": self.partner1.id,
                 "pms_property_id": self.pms_property1.id,
                 "pricelist_id": self.pricelist1.id,
diff --git a/pms/views/pms_property_views.xml b/pms/views/pms_property_views.xml
index 9145b90813f..4ac88fb28a0 100644
--- a/pms/views/pms_property_views.xml
+++ b/pms/views/pms_property_views.xml
@@ -14,7 +14,46 @@
                     <notebook>
                         <page string="General Information" name="property_general">
                             <group>
-
+                                <div class="o_address_format">
+                                    <field
+                                        name="street"
+                                        placeholder="Street..."
+                                        class="o_address_street"
+                                    />
+                                    <field
+                                        name="street2"
+                                        placeholder="Street 2..."
+                                        class="o_address_street"
+                                    />
+                                    <field
+                                        name="city"
+                                        placeholder="City"
+                                        class="o_address_city"
+                                    />
+                                    <field
+                                        name="state_id"
+                                        class="o_address_state"
+                                        placeholder="State"
+                                    />
+                                    <field
+                                        name="zip"
+                                        placeholder="ZIP"
+                                        class="o_address_zip"
+                                    />
+                                    <field
+                                        name="country_id"
+                                        placeholder="Country"
+                                        class="o_address_country"
+                                    />
+                                </div>
+                            </group>
+                            <group>
+                                <div class="row">
+                                    <div class="col-6">
+                                        <label for="phone" />
+                                        <field name="phone" />
+                                    </div>
+                                </div>
                             </group>
                         </page>
                         <page string="Settings" name="property_settings">
diff --git a/pms/views/pms_reservation_views.xml b/pms/views/pms_reservation_views.xml
index af3fd4b9a6c..7fbe5382514 100644
--- a/pms/views/pms_reservation_views.xml
+++ b/pms/views/pms_reservation_views.xml
@@ -16,6 +16,7 @@
                     <field name="tax_ids" invisible="1" />
                     <field name="checkin_partner_count" invisible="1" />
                     <field name="to_assign" invisible="1" />
+                    <field name="check_adults" invisible="1" />
                     <button
                         name="confirm"
                         string="Confirm"
diff --git a/pms/views/traveller_report_template.xml b/pms/views/traveller_report_template.xml
index 8d3460eee22..4d9db65a4b4 100644
--- a/pms/views/traveller_report_template.xml
+++ b/pms/views/traveller_report_template.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <template id="report_viajero">
+    <template id="traveller_report">
         <t t-call="web.basic_layout">
             <t t-foreach="docs" t-as="docs">
             <img
diff --git a/pms_l10n_es/__manifest__.py b/pms_l10n_es/__manifest__.py
index 536b9cc6c5d..325284c4ba9 100644
--- a/pms_l10n_es/__manifest__.py
+++ b/pms_l10n_es/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "PMS Spanish Adaptation",
-    "version": "14.0.2.0.0",
+    "version": "14.0.2.0.1",
     "author": "Commit [Sun], Odoo Community Association (OCA)",
     "license": "AGPL-3",
     "application": True,
@@ -16,22 +16,29 @@
         "partner_contact_gender",
         "partner_contact_birthdate",
         "partner_contact_nationality",
+        "base_iso3166",
         "queue_job",
     ],
     "external_dependencies": {
         "python": [
             "bs4",
+            "pycountry",
         ],
     },
     "data": [
+        "data/res.country.state.csv",
+        "data/pms.ine.tourism.type.category.csv",
         "data/cron_jobs.xml",
         "data/pms_data.xml",
         "data/queue_data.xml",
         "data/queue_job_function_data.xml",
         "security/ir.model.access.csv",
         "views/pms_property_views.xml",
+        "views/pms_room_views.xml",
         "views/pms_log_institution_traveller_report_views.xml",
+        "views/pms_ine_tourism_type_category.xml",
         "wizards/traveller_report.xml",
+        "wizards/wizard_ine.xml",
     ],
     "installable": True,
 }
diff --git a/pms_l10n_es/data/pms.ine.tourism.type.category.csv b/pms_l10n_es/data/pms.ine.tourism.type.category.csv
new file mode 100644
index 00000000000..2a6042ae732
--- /dev/null
+++ b/pms_l10n_es/data/pms.ine.tourism.type.category.csv
@@ -0,0 +1,53 @@
+"type","category"
+Hoteles,H1
+Hoteles,H2
+Hoteles,H3
+Hoteles,H4
+Hoteles,H5
+Hoteles-apartamentos,AP
+Hoteles-apartamentos,HA
+Hoteles-apartamentos,HA1
+Hoteles-apartamentos,HA2
+Hoteles-apartamentos,HA3
+Hoteles-apartamentos,HA4
+Hoteles-apartamentos,HA5
+Hoteles-residencias,HR
+Hoteles-residencias,HR1
+Hoteles-residencias,HR2
+Hoteles-residencias,HR3
+Hoteles-residencias,HR4
+Hoteles-residencias,HR5
+Moteles,M1
+Moteles,M2
+Moteles,M3
+Paradores Nacionales,PN3
+Paradores Nacionales,PN4
+Paradores Nacionales,PN5
+Ciudades de vacaciones,CV1
+Ciudades de vacaciones,CV2
+Ciudades de vacaciones,CV3
+Residencias-apartamentos,RA1
+Residencias-apartamentos,RA2
+Residencias-apartamentos,RA3
+Residencias-apartamentos,RA4
+Hostales,HS
+Hostales,HS1
+Hostales,HS2
+Hostales,HS3
+Hostales,HSR
+Hostales,HSR1
+Hostales,HSR2
+Hostales,HSR3
+Hostales generales, HSE
+Casas de Huéspedes,CH
+Casas de Huéspedes,CH1
+Fondas,F1
+Fondas,F2
+Fondas,F3
+Pensiones,P
+Pensiones,P1
+Pensiones,P2
+Pensiones,P3
+Pensiones,PA
+Pensiones,PT
+Otros,Otras
diff --git a/pms_l10n_es/data/res.country.state.csv b/pms_l10n_es/data/res.country.state.csv
new file mode 100644
index 00000000000..d72563a825b
--- /dev/null
+++ b/pms_l10n_es/data/res.country.state.csv
@@ -0,0 +1,53 @@
+"id","ine_code"
+base.state_es_c,"ES111"
+base.state_es_vi,"ES211"
+base.state_es_ab,"ES421"
+base.state_es_a,"ES521"
+base.state_es_al,"ES611"
+base.state_es_o,"ES120"
+base.state_es_av,"ES411"
+base.state_es_ba,"ES431"
+base.state_es_pm,"ES530"
+base.state_es_b,"ES511"
+base.state_es_bu,"ES412"
+base.state_es_cc,"ES432"
+base.state_es_ca,"ES612"
+base.state_es_s,"ES130"
+base.state_es_cs,"ES522"
+base.state_es_ce,"ES630"
+base.state_es_cr,"ES422"
+base.state_es_co,"ES613"
+base.state_es_cu,"ES423"
+base.state_es_gi,"ES512"
+base.state_es_gr,"ES614"
+base.state_es_gu,"ES424"
+base.state_es_ss,"ES212"
+base.state_es_h,"ES615"
+base.state_es_hu,"ES241"
+base.state_es_j,"ES616"
+base.state_es_lo,"ES230"
+base.state_es_gc,"ES701"
+base.state_es_le,"ES413"
+base.state_es_l,"ES513"
+base.state_es_lu,"ES112"
+base.state_es_m,"ES300"
+base.state_es_ma,"ES617"
+base.state_es_ml,"ES640"
+base.state_es_mu,"ES620"
+base.state_es_na,"ES220"
+base.state_es_or,"ES113"
+base.state_es_p,"ES414"
+base.state_es_po,"ES114"
+base.state_es_sa,"ES415"
+base.state_es_tf,"ES702"
+base.state_es_sg,"ES416"
+base.state_es_se,"ES618"
+base.state_es_so,"ES417"
+base.state_es_t,"ES514"
+base.state_es_te,"ES242"
+base.state_es_to,"ES425"
+base.state_es_v,"ES523"
+base.state_es_va,"ES418"
+base.state_es_bi,"ES213"
+base.state_es_za,"ES419"
+base.state_es_z,"ES243"
diff --git a/pms_l10n_es/i18n/pms_l10n_es.pot b/pms_l10n_es/i18n/pms_l10n_es.pot
index e704f4d1962..0cecf85bee2 100644
--- a/pms_l10n_es/i18n/pms_l10n_es.pot
+++ b/pms_l10n_es/i18n/pms_l10n_es.pot
@@ -20,6 +20,16 @@ msgstr ""
 msgid "Automatic Send Traveller Report"
 msgstr ""
 
+#. module: pms_l10n_es
+#: model:ir.model.fields,field_description:pms_l10n_es.field_pms_property__ine_seats
+msgid "Beds available excluding extra beds"
+msgstr ""
+
+#. module: pms_l10n_es
+#: model:ir.model.fields,field_description:pms_l10n_es.field_pms_ine_tourism_type_category__category
+msgid "Category"
+msgstr ""
+
 #. module: pms_l10n_es
 #: code:addons/pms_l10n_es/models/pms_property.py:0
 #: code:addons/pms_l10n_es/models/pms_property.py:0
@@ -80,12 +90,21 @@ msgid "Could not upload file."
 msgstr ""
 
 #. module: pms_l10n_es
+#: model:ir.model,name:pms_l10n_es.model_res_country_state
+msgid "Country state"
+msgstr ""
+
+#. module: pms_l10n_es
+#: model:ir.model.fields,field_description:pms_l10n_es.field_pms_ine_tourism_type_category__create_uid
+#: model:ir.model.fields,field_description:pms_l10n_es.field_pms_ine_wizard__create_uid
 #: model:ir.model.fields,field_description:pms_l10n_es.field_pms_log_institution_traveller_report__create_uid
 #: model:ir.model.fields,field_description:pms_l10n_es.field_traveller_report_wizard__create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: pms_l10n_es
+#: model:ir.model.fields,field_description:pms_l10n_es.field_pms_ine_tourism_type_category__create_date
+#: model:ir.model.fields,field_description:pms_l10n_es.field_pms_ine_wizard__create_date
 #: model:ir.model.fields,field_description:pms_l10n_es.field_pms_log_institution_traveller_report__create_date
 #: model:ir.model.fields,field_description:pms_l10n_es.field_traveller_report_wizard__create_date
 msgid "Created on"
@@ -112,8 +131,12 @@ msgid "Detailed message"
 msgstr ""
 
 #. module: pms_l10n_es
+#: model:ir.model.fields,field_description:pms_l10n_es.field_pms_ine_tourism_type_category__display_name
+#: model:ir.model.fields,field_description:pms_l10n_es.field_pms_ine_wizard__display_name
 #: model:ir.model.fields,field_description:pms_l10n_es.field_pms_log_institution_traveller_report__display_name
 #: model:ir.model.fields,field_description:pms_l10n_es.field_pms_property__display_name
+#: model:ir.model.fields,field_description:pms_l10n_es.field_pms_room__display_name
+#: model:ir.model.fields,field_description:pms_l10n_es.field_res_country_state__display_name
 #: model:ir.model.fields,field_description:pms_l10n_es.field_traveller_report_wizard__display_name
 msgid "Display Name"
 msgstr ""
@@ -134,21 +157,44 @@ msgstr ""
 msgid "Ertxaintxa (soon)"
 msgstr ""
 
+#. module: pms_l10n_es
+#: model:ir.model.fields,field_description:pms_l10n_es.field_pms_property__ine_eventual_staff
+msgid "Eventual Staff"
+msgstr ""
+
 #. module: pms_l10n_es
 #: model_terms:ir.ui.view,arch_db:pms_l10n_es.pms_log_institution_traveller_report_view_tree
 msgid "File"
 msgstr ""
 
 #. module: pms_l10n_es
+#: model:ir.model.fields,field_description:pms_l10n_es.field_pms_ine_wizard__txt_binary
 #: model:ir.model.fields,field_description:pms_l10n_es.field_traveller_report_wizard__txt_binary
 msgid "File Download"
 msgstr ""
 
 #. module: pms_l10n_es
+#: model:ir.model.fields,field_description:pms_l10n_es.field_pms_ine_wizard__txt_message
 #: model:ir.model.fields,field_description:pms_l10n_es.field_traveller_report_wizard__txt_message
 msgid "File Preview"
 msgstr ""
 
+#. module: pms_l10n_es
+#: model:ir.model.fields,field_description:pms_l10n_es.field_pms_ine_wizard__start_date
+msgid "From"
+msgstr ""
+
+#. module: pms_l10n_es
+#: model_terms:ir.ui.view,arch_db:pms_l10n_es.pms_ine_wizard
+msgid "Generate INE XML"
+msgstr ""
+
+#. module: pms_l10n_es
+#: model:ir.actions.act_window,name:pms_l10n_es.action_ine_report
+#: model:ir.ui.menu,name:pms_l10n_es.menu_ine
+msgid "Generate INE file"
+msgstr ""
+
 #. module: pms_l10n_es
 #: model:ir.model.fields.selection,name:pms_l10n_es.selection__pms_property__institution__guardia_civil
 msgid "Guardia Civil"
@@ -160,17 +206,52 @@ msgid "Guest information sending settings"
 msgstr ""
 
 #. module: pms_l10n_es
+#: model:ir.model,name:pms_l10n_es.model_pms_ine_tourism_type_category
+#: model:ir.model.fields,help:pms_l10n_es.field_pms_property__ine_category_id
+msgid "Hotel category in the Ministry of Tourism. Used for INE statistics."
+msgstr ""
+
+#. module: pms_l10n_es
+#: model:ir.model.fields,field_description:pms_l10n_es.field_pms_ine_tourism_type_category__id
+#: model:ir.model.fields,field_description:pms_l10n_es.field_pms_ine_wizard__id
 #: model:ir.model.fields,field_description:pms_l10n_es.field_pms_log_institution_traveller_report__id
 #: model:ir.model.fields,field_description:pms_l10n_es.field_pms_property__id
+#: model:ir.model.fields,field_description:pms_l10n_es.field_pms_room__id
+#: model:ir.model.fields,field_description:pms_l10n_es.field_res_country_state__id
 #: model:ir.model.fields,field_description:pms_l10n_es.field_traveller_report_wizard__id
 msgid "ID"
 msgstr ""
 
+#. module: pms_l10n_es
+#: model:ir.actions.act_window,name:pms_l10n_es.open_pms_ine_tourism_category
+msgid "INE Categories"
+msgstr ""
+
+#. module: pms_l10n_es
+#: model_terms:ir.ui.view,arch_db:pms_l10n_es.view_property_form_pms_l10n_es
+msgid "INE Settings"
+msgstr ""
+
+#. module: pms_l10n_es
+#: model:ir.model.fields,field_description:pms_l10n_es.field_res_country_state__ine_code
+msgid "INE State Code"
+msgstr ""
+
 #. module: pms_l10n_es
 #: model:ir.model.fields,help:pms_l10n_es.field_pms_property__institution_property_id
 msgid "Id provided by institution to send data from property."
 msgstr ""
 
+#. module: pms_l10n_es
+#: model:ir.model.fields,field_description:pms_l10n_es.field_pms_room__in_ine
+msgid "In INE"
+msgstr ""
+
+#. module: pms_l10n_es
+#: model:ir.model.fields,field_description:pms_l10n_es.field_pms_property__ine_category_id
+msgid "Ine Category"
+msgstr ""
+
 #. module: pms_l10n_es
 #: model:ir.model.fields,field_description:pms_l10n_es.field_pms_property__institution
 msgid "Institution"
@@ -197,19 +278,27 @@ msgid "Institution user"
 msgstr ""
 
 #. module: pms_l10n_es
+#: model:ir.model.fields,field_description:pms_l10n_es.field_pms_ine_tourism_type_category____last_update
+#: model:ir.model.fields,field_description:pms_l10n_es.field_pms_ine_wizard____last_update
 #: model:ir.model.fields,field_description:pms_l10n_es.field_pms_log_institution_traveller_report____last_update
 #: model:ir.model.fields,field_description:pms_l10n_es.field_pms_property____last_update
+#: model:ir.model.fields,field_description:pms_l10n_es.field_pms_room____last_update
+#: model:ir.model.fields,field_description:pms_l10n_es.field_res_country_state____last_update
 #: model:ir.model.fields,field_description:pms_l10n_es.field_traveller_report_wizard____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: pms_l10n_es
+#: model:ir.model.fields,field_description:pms_l10n_es.field_pms_ine_tourism_type_category__write_uid
+#: model:ir.model.fields,field_description:pms_l10n_es.field_pms_ine_wizard__write_uid
 #: model:ir.model.fields,field_description:pms_l10n_es.field_pms_log_institution_traveller_report__write_uid
 #: model:ir.model.fields,field_description:pms_l10n_es.field_traveller_report_wizard__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: pms_l10n_es
+#: model:ir.model.fields,field_description:pms_l10n_es.field_pms_ine_tourism_type_category__write_date
+#: model:ir.model.fields,field_description:pms_l10n_es.field_pms_ine_wizard__write_date
 #: model:ir.model.fields,field_description:pms_l10n_es.field_pms_log_institution_traveller_report__write_date
 #: model:ir.model.fields,field_description:pms_l10n_es.field_traveller_report_wizard__write_date
 msgid "Last Updated on"
@@ -230,6 +319,16 @@ msgstr ""
 msgid "Log of sending files to institutions"
 msgstr ""
 
+#. module: pms_l10n_es
+#: model:ir.model.fields,field_description:pms_l10n_es.field_pms_ine_wizard__adr
+msgid "Monthly ADR"
+msgstr ""
+
+#. module: pms_l10n_es
+#: model:ir.model.fields,field_description:pms_l10n_es.field_pms_ine_wizard__revpar
+msgid "Monthly RevPAR"
+msgstr ""
+
 #. module: pms_l10n_es
 #: model:ir.model.fields.selection,name:pms_l10n_es.selection__pms_property__institution__mossos
 msgid "Mossos_d'esquadra (soon)"
@@ -240,6 +339,11 @@ msgstr ""
 msgid "Password provided by institution to send the data."
 msgstr ""
 
+#. module: pms_l10n_es
+#: model:ir.model.fields,field_description:pms_l10n_es.field_pms_property__ine_permanent_staff
+msgid "Permanent Staff"
+msgstr ""
+
 #. module: pms_l10n_es
 #: model:ir.model.fields.selection,name:pms_l10n_es.selection__pms_property__institution__policia_nacional
 msgid "Policía Nacional"
@@ -252,14 +356,26 @@ msgstr ""
 
 #. module: pms_l10n_es
 #: model:ir.model,name:pms_l10n_es.model_pms_property
+#: model:ir.model.fields,field_description:pms_l10n_es.field_pms_ine_wizard__pms_property_id
 msgid "Property"
 msgstr ""
 
+#. module: pms_l10n_es
+#: model:ir.model,name:pms_l10n_es.model_pms_room
+msgid "Property Room"
+msgstr ""
+
 #. module: pms_l10n_es
 #: model_terms:ir.ui.view,arch_db:pms_l10n_es.pms_log_institution_traveller_report_view_tree
 msgid "Property Ubications"
 msgstr ""
 
+#. module: pms_l10n_es
+#: model:ir.model.fields,help:pms_l10n_es.field_pms_property__ine_tourism_number
+msgid ""
+"Registration number in the Ministry of Tourism. Used for INE statistics."
+msgstr ""
+
 #. module: pms_l10n_es
 #: model:ir.model,name:pms_l10n_es.model_pms_log_institution_traveller_report
 msgid "Report of daily sending files of travellers to institutions."
@@ -270,6 +386,13 @@ msgstr ""
 msgid "Send file"
 msgstr ""
 
+#. module: pms_l10n_es
+#: model_terms:ir.ui.view,arch_db:pms_l10n_es.pms_ine_wizard
+msgid ""
+"Send survey to Spanish National Institute of Statistics (INE)\n"
+"                                <i class=\"fa fa-signal\"/>"
+msgstr ""
+
 #. module: pms_l10n_es
 #: code:addons/pms_l10n_es/wizards/traveller_report.py:0
 #: code:addons/pms_l10n_es/wizards/traveller_report.py:0
@@ -291,11 +414,34 @@ msgstr ""
 msgid "Successful file sending"
 msgstr ""
 
+#. module: pms_l10n_es
+#: model:ir.model.fields,help:pms_l10n_es.field_pms_room__in_ine
+msgid "Take it into account to generate INE statistics"
+msgstr ""
+
 #. module: pms_l10n_es
 #: model_terms:ir.ui.view,arch_db:pms_l10n_es.view_property_form_pms_l10n_es
 msgid "Test user/password"
 msgstr ""
 
+#. module: pms_l10n_es
+#: code:addons/pms_l10n_es/wizards/wizard_ine.py:0
+#, python-format
+msgid "The company VAT is not established."
+msgstr ""
+
+#. module: pms_l10n_es
+#: code:addons/pms_l10n_es/wizards/wizard_ine.py:0
+#, python-format
+msgid "The company name is not established."
+msgstr ""
+
+#. module: pms_l10n_es
+#: code:addons/pms_l10n_es/wizards/wizard_ine.py:0
+#, python-format
+msgid "The date range must belong to the same month."
+msgstr ""
+
 #. module: pms_l10n_es
 #: code:addons/pms_l10n_es/wizards/traveller_report.py:0
 #, python-format
@@ -308,6 +454,74 @@ msgstr ""
 msgid "The guest information sending settings is not property updated."
 msgstr ""
 
+#. module: pms_l10n_es
+#: code:addons/pms_l10n_es/wizards/wizard_ine.py:0
+#, python-format
+msgid ""
+"The number of seats, excluding extra beds (%s) exceeds the number of seats "
+"established in the property (%s)"
+msgstr ""
+
+#. module: pms_l10n_es
+#: code:addons/pms_l10n_es/wizards/wizard_ine.py:0
+#, python-format
+msgid "The property category is not established."
+msgstr ""
+
+#. module: pms_l10n_es
+#: code:addons/pms_l10n_es/wizards/wizard_ine.py:0
+#, python-format
+msgid "The property city is not established."
+msgstr ""
+
+#. module: pms_l10n_es
+#: code:addons/pms_l10n_es/wizards/wizard_ine.py:0
+#: code:addons/pms_l10n_es/wizards/wizard_ine.py:0
+#, python-format
+msgid "The property name is not established."
+msgstr ""
+
+#. module: pms_l10n_es
+#: code:addons/pms_l10n_es/wizards/wizard_ine.py:0
+#, python-format
+msgid "The property phone is not established."
+msgstr ""
+
+#. module: pms_l10n_es
+#: code:addons/pms_l10n_es/wizards/wizard_ine.py:0
+#, python-format
+msgid "The property state is not established."
+msgstr ""
+
+#. module: pms_l10n_es
+#: code:addons/pms_l10n_es/wizards/wizard_ine.py:0
+#, python-format
+msgid "The property street is not established."
+msgstr ""
+
+#. module: pms_l10n_es
+#: code:addons/pms_l10n_es/wizards/wizard_ine.py:0
+#: code:addons/pms_l10n_es/wizards/wizard_ine.py:0
+#, python-format
+msgid "The property tourism number is not established."
+msgstr ""
+
+#. module: pms_l10n_es
+#: code:addons/pms_l10n_es/wizards/wizard_ine.py:0
+#, python-format
+msgid "The property zip is not established."
+msgstr ""
+
+#. module: pms_l10n_es
+#: model:ir.model.fields,field_description:pms_l10n_es.field_pms_ine_wizard__end_date
+msgid "To"
+msgstr ""
+
+#. module: pms_l10n_es
+#: model:ir.model.fields,field_description:pms_l10n_es.field_pms_property__ine_tourism_number
+msgid "Tourism number"
+msgstr ""
+
 #. module: pms_l10n_es
 #: code:addons/pms_l10n_es/wizards/traveller_report.py:0
 #: model:ir.actions.act_window,name:pms_l10n_es.action_traveller_report
@@ -318,12 +532,36 @@ msgid "Traveller Report"
 msgstr ""
 
 #. module: pms_l10n_es
+#: model:ir.model.fields,field_description:pms_l10n_es.field_pms_ine_wizard__txt_filename
 #: model:ir.model.fields,field_description:pms_l10n_es.field_pms_log_institution_traveller_report__txt_filename
 #: model:ir.model.fields,field_description:pms_l10n_es.field_traveller_report_wizard__txt_filename
 msgid "Txt Filename"
 msgstr ""
 
+#. module: pms_l10n_es
+#: model:ir.model.fields,field_description:pms_l10n_es.field_pms_ine_tourism_type_category__type
+msgid "Type"
+msgstr ""
+
+#. module: pms_l10n_es
+#: model:ir.model.fields,field_description:pms_l10n_es.field_pms_property__ine_unpaid_staff
+msgid "Unpaid Staff"
+msgstr ""
+
+#. module: pms_l10n_es
+#: model:ir.model.fields,help:pms_l10n_es.field_pms_property__ine_eventual_staff
+#: model:ir.model.fields,help:pms_l10n_es.field_pms_property__ine_permanent_staff
+#: model:ir.model.fields,help:pms_l10n_es.field_pms_property__ine_seats
+#: model:ir.model.fields,help:pms_l10n_es.field_pms_property__ine_unpaid_staff
+msgid "Used for INE statistics."
+msgstr ""
+
 #. module: pms_l10n_es
 #: model:ir.model.fields,help:pms_l10n_es.field_pms_property__institution_user
 msgid "User provided by institution to send the data."
 msgstr ""
+
+#. module: pms_l10n_es
+#: model:ir.model,name:pms_l10n_es.model_pms_ine_wizard
+msgid "Wizard to generate statistical info."
+msgstr ""
diff --git a/pms_l10n_es/models/__init__.py b/pms_l10n_es/models/__init__.py
index 2e5d43f5f66..8e3fef3c5eb 100644
--- a/pms_l10n_es/models/__init__.py
+++ b/pms_l10n_es/models/__init__.py
@@ -2,3 +2,6 @@
 # from . import pms_checkin_partner
 from . import pms_property
 from . import pms_log_institution_traveller_report
+from . import res_country_state
+from . import pms_ine_tourism_type_category
+from . import pms_room
diff --git a/pms_l10n_es/models/pms_ine_tourism_type_category.py b/pms_l10n_es/models/pms_ine_tourism_type_category.py
new file mode 100644
index 00000000000..60db3cf9624
--- /dev/null
+++ b/pms_l10n_es/models/pms_ine_tourism_type_category.py
@@ -0,0 +1,16 @@
+from odoo import fields, models
+
+
+class PmsIneTourismCategory(models.Model):
+    _name = "pms.ine.tourism.type.category"
+    _description = "Hotel category in the Ministry of Tourism. Used for INE statistics."
+
+    type = fields.Char("Type", required=True)
+    category = fields.Char("Category", required=True)
+
+    def name_get(self):
+        data = []
+        for record in self:
+            display_value = record.category + " (" + record.type + ") "
+            data.append((record.id, display_value))
+        return data
diff --git a/pms_l10n_es/models/pms_property.py b/pms_l10n_es/models/pms_property.py
index e34f02843ce..83e4d434a8f 100644
--- a/pms_l10n_es/models/pms_property.py
+++ b/pms_l10n_es/models/pms_property.py
@@ -33,6 +33,28 @@ class PmsProperty(models.Model):
         string="Institution password",
         help="Password provided by institution to send the data.",
     )
+    ine_tourism_number = fields.Char(
+        "Tourism number",
+        help="Registration number in the Ministry of Tourism. Used for INE statistics.",
+    )
+    ine_seats = fields.Integer(
+        "Beds available excluding extra beds",
+        default=0,
+        help="Used for INE statistics.",
+    )
+    ine_permanent_staff = fields.Integer(
+        "Permanent Staff", default=0, help="Used for INE statistics."
+    )
+    ine_eventual_staff = fields.Integer(
+        "Eventual Staff", default=0, help="Used for INE statistics."
+    )
+    ine_unpaid_staff = fields.Integer(
+        "Unpaid Staff", default=0, help="Used for INE statistics."
+    )
+    ine_category_id = fields.Many2one(
+        "pms.ine.tourism.type.category",
+        help="Hotel category in the Ministry of Tourism. Used for INE statistics.",
+    )
 
     def test_connection(self):
         headers = {
diff --git a/pms_l10n_es/models/pms_room.py b/pms_l10n_es/models/pms_room.py
new file mode 100644
index 00000000000..76dbc5efd35
--- /dev/null
+++ b/pms_l10n_es/models/pms_room.py
@@ -0,0 +1,10 @@
+from odoo import fields, models
+
+
+class PmsRoom(models.Model):
+    _inherit = "pms.room"
+    in_ine = fields.Boolean(
+        string="In INE",
+        help="Take it into account to generate INE statistics",
+        default=True,
+    )
diff --git a/pms_l10n_es/models/res_country_state.py b/pms_l10n_es/models/res_country_state.py
new file mode 100644
index 00000000000..67b0ecb3936
--- /dev/null
+++ b/pms_l10n_es/models/res_country_state.py
@@ -0,0 +1,6 @@
+from odoo import fields, models
+
+
+class ResCountryState(models.Model):
+    _inherit = "res.country.state"
+    ine_code = fields.Char(string="INE State Code")
diff --git a/pms_l10n_es/security/ir.model.access.csv b/pms_l10n_es/security/ir.model.access.csv
index 36ef563cc3a..444000dce24 100644
--- a/pms_l10n_es/security/ir.model.access.csv
+++ b/pms_l10n_es/security/ir.model.access.csv
@@ -1,3 +1,5 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 user_access_traveller_report_wizard,user_access_traveller_report_wizard,model_traveller_report_wizard,pms.group_pms_user,1,1,1,1
 user_access_traveller_report_logs,user_access_traveller_report_logs,model_pms_log_institution_traveller_report,pms.group_pms_user,1,1,1,1
+user_access_pms_ine_tourism_type_category,user_access_pms_ine_tourism_type_category,model_pms_ine_tourism_type_category,pms.group_pms_user,1,1,1,1
+user_access_pms_ine_wizard,user_access_pms_ine_wizard,model_pms_ine_wizard,pms.group_pms_user,1,1,1,1
diff --git a/pms_l10n_es/tests/__init__.py b/pms_l10n_es/tests/__init__.py
new file mode 100644
index 00000000000..8d0beb4024a
--- /dev/null
+++ b/pms_l10n_es/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_wizard_ine
diff --git a/pms_l10n_es/tests/common.py b/pms_l10n_es/tests/common.py
new file mode 100644
index 00000000000..e79743bb5e1
--- /dev/null
+++ b/pms_l10n_es/tests/common.py
@@ -0,0 +1,29 @@
+from odoo.tests import common
+
+
+class TestPms(common.SavepointCase):
+    def setUp(self):
+        super().setUp()
+        self.pricelist1 = self.env["product.pricelist"].create(
+            {
+                "name": "Pricelist 1",
+            }
+        )
+        self.company1 = self.env["res.company"].create(
+            {
+                "name": "Company 1",
+            }
+        )
+        self.pms_property1 = self.env["pms.property"].create(
+            {
+                "name": "Property 1",
+                "company_id": self.company1.id,
+                "default_pricelist_id": self.pricelist1.id,
+            }
+        )
+        self.room_type_class1 = self.env["pms.room.type.class"].create(
+            {
+                "name": "Room Type Class 1",
+                "default_code": "RTC1",
+            }
+        )
diff --git a/pms_l10n_es/tests/test_wizard_ine.py b/pms_l10n_es/tests/test_wizard_ine.py
new file mode 100644
index 00000000000..5bd89e6f00f
--- /dev/null
+++ b/pms_l10n_es/tests/test_wizard_ine.py
@@ -0,0 +1,632 @@
+import datetime
+
+from freezegun import freeze_time
+
+from .common import TestPms
+
+
+@freeze_time("2021-02-01")
+class TestWizardINE(TestPms):
+    def setUp(self):
+        super().setUp()
+        # number of seats established in the property
+        self.pms_property1.ine_seats = 50
+
+        # create room types
+        self.room_type = self.env["pms.room.type"].create(
+            {
+                "name": "Room type test",
+                "default_code": "DBL_Test",
+                "class_id": self.room_type_class1.id,
+            }
+        )
+        # create rooms
+        self.room_double_1 = self.env["pms.room"].create(
+            {
+                "pms_property_id": self.pms_property1.id,
+                "name": "Room test 1",
+                "room_type_id": self.room_type.id,
+                "capacity": 2,
+            }
+        )
+        self.room_double_2 = self.env["pms.room"].create(
+            {
+                "pms_property_id": self.pms_property1.id,
+                "name": "Room test 2",
+                "room_type_id": self.room_type.id,
+                "capacity": 2,
+            }
+        )
+        self.room_single_1 = self.env["pms.room"].create(
+            {
+                "pms_property_id": self.pms_property1.id,
+                "name": "Room test 3",
+                "room_type_id": self.room_type.id,
+                "capacity": 1,
+                "extra_beds_allowed": 1,
+            }
+        )
+        self.room_triple1 = self.env["pms.room"].create(
+            {
+                "pms_property_id": self.pms_property1.id,
+                "name": "Room test 4",
+                "room_type_id": self.room_type.id,
+                "capacity": 3,
+            }
+        )
+
+        # create document category
+        self.id_category_passport = self.env["res.partner.id_category"].create(
+            {
+                "name": "Passport",
+                "code": "P",
+                "active": True,
+            }
+        )
+        # get records of russia, italy and afghanistan
+        self.country_russia = self.env["res.country"].search([("code", "=", "RU")])
+        self.country_russia.ensure_one()
+        self.country_italy = self.env["res.country"].search([("code", "=", "IT")])
+        self.country_italy.ensure_one()
+        self.country_afghanistan = self.env["res.country"].search([("code", "=", "AF")])
+        self.country_afghanistan.ensure_one()
+        # Create partner 1 (italy)
+        self.partner_1 = self.env["res.partner"].create(
+            {
+                "name": "partner1",
+                "country_id": self.country_italy.id,
+                "nationality_id": self.country_italy.id,
+                "birthdate_date": "2000-06-25",
+                "gender": "male",
+            }
+        )
+        self.env["res.partner.id_number"].create(
+            {
+                "category_id": self.id_category_passport.id,
+                "name": "55103354T",
+                "valid_from": datetime.date.today(),
+                "partner_id": self.partner_1.id,
+            }
+        )
+
+        # Create partner 2 (russia)
+        self.partner_2 = self.env["res.partner"].create(
+            {
+                "name": "partner2",
+                "country_id": self.country_russia.id,
+                "nationality_id": self.country_russia.id,
+                "birthdate_date": "2000-06-25",
+                "gender": "male",
+            }
+        )
+        self.env["res.partner.id_number"].create(
+            {
+                "category_id": self.id_category_passport.id,
+                "name": "45437298Q",
+                "valid_from": datetime.date.today(),
+                "partner_id": self.partner_2.id,
+            }
+        )
+        # Create partner 3 (italy)
+        self.partner_3 = self.env["res.partner"].create(
+            {
+                "name": "partner3",
+                "country_id": self.country_italy.id,
+                "nationality_id": self.country_italy.id,
+                "birthdate_date": "2000-06-25",
+                "gender": "male",
+            }
+        )
+        self.env["res.partner.id_number"].create(
+            {
+                "category_id": self.id_category_passport.id,
+                "name": "81534086Y",
+                "valid_from": datetime.date.today(),
+                "partner_id": self.partner_3.id,
+            }
+        )
+        # Create partner 4 (italy)
+        self.partner_4 = self.env["res.partner"].create(
+            {
+                "name": "partner4",
+                "country_id": self.country_italy.id,
+                "nationality_id": self.country_italy.id,
+                "birthdate_date": "2000-06-25",
+                "gender": "male",
+            }
+        )
+        self.env["res.partner.id_number"].create(
+            {
+                "category_id": self.id_category_passport.id,
+                "name": "00807643K",
+                "valid_from": datetime.date.today(),
+                "partner_id": self.partner_4.id,
+            }
+        )
+        # Create partner 5 (afghanistan)
+        self.partner_5 = self.env["res.partner"].create(
+            {
+                "name": "partner5",
+                "country_id": self.country_afghanistan.id,
+                "nationality_id": self.country_afghanistan.id,
+                "birthdate_date": "2000-06-25",
+                "gender": "male",
+            }
+        )
+        self.env["res.partner.id_number"].create(
+            {
+                "category_id": self.id_category_passport.id,
+                "name": "54564399G",
+                "valid_from": datetime.date.today(),
+                "partner_id": self.partner_5.id,
+            }
+        )
+        # Create partner 6 (afghanistan)
+        self.partner_6 = self.env["res.partner"].create(
+            {
+                "name": "partner6",
+                "country_id": self.country_afghanistan.id,
+                "nationality_id": self.country_afghanistan.id,
+                "birthdate_date": "2000-06-25",
+                "gender": "male",
+            }
+        )
+        self.env["res.partner.id_number"].create(
+            {
+                "category_id": self.id_category_passport.id,
+                "name": "39854152M",
+                "valid_from": datetime.date.today(),
+                "partner_id": self.partner_6.id,
+            }
+        )
+        # Create partner 7 (afghanistan)
+        self.partner_7 = self.env["res.partner"].create(
+            {
+                "name": "partner7",
+                "country_id": self.country_afghanistan.id,
+                "nationality_id": self.country_afghanistan.id,
+                "birthdate_date": "2000-06-25",
+                "gender": "male",
+            }
+        )
+        self.env["res.partner.id_number"].create(
+            {
+                "category_id": self.id_category_passport.id,
+                "name": "39854152O",
+                "valid_from": datetime.date.today(),
+                "partner_id": self.partner_7.id,
+            }
+        )
+
+        # Create reservation 1
+        self.reservation_1 = self.env["pms.reservation"].create(
+            {
+                "checkin": datetime.date.today(),
+                "checkout": datetime.date.today() + datetime.timedelta(days=1),
+                "preferred_room_id": self.room_double_1.id,
+                "partner_id": self.partner_1.id,
+                "adults": 2,
+                "pms_property_id": self.pms_property1.id,
+            }
+        )
+        self.checkin1 = self.env["pms.checkin.partner"].create(
+            {
+                "partner_id": self.partner_1.id,
+                "reservation_id": self.reservation_1.id,
+            }
+        )
+
+        self.checkin2 = self.env["pms.checkin.partner"].create(
+            {
+                "partner_id": self.partner_2.id,
+                "reservation_id": self.reservation_1.id,
+            }
+        )
+        # Create reservation 2
+        self.reservation_2 = self.env["pms.reservation"].create(
+            {
+                "checkin": datetime.date.today() + datetime.timedelta(days=1),
+                "checkout": datetime.date.today() + datetime.timedelta(days=2),
+                "preferred_room_id": self.room_triple1.id,
+                "partner_id": self.partner_3.id,
+                "adults": 2,
+                "pms_property_id": self.pms_property1.id,
+            }
+        )
+        self.checkin3 = self.env["pms.checkin.partner"].create(
+            {
+                "partner_id": self.partner_3.id,
+                "reservation_id": self.reservation_2.id,
+            }
+        )
+        self.checkin4 = self.env["pms.checkin.partner"].create(
+            {
+                "partner_id": self.partner_4.id,
+                "reservation_id": self.reservation_2.id,
+            }
+        )
+        # Create reservation 3
+        self.reservation_3 = self.env["pms.reservation"].create(
+            {
+                "checkin": datetime.date.today() + datetime.timedelta(days=1),
+                "checkout": datetime.date.today() + datetime.timedelta(days=3),
+                "preferred_room_id": self.room_double_2.id,
+                "partner_id": self.partner_5.id,
+                "adults": 1,
+                "pms_property_id": self.pms_property1.id,
+            }
+        )
+        self.checkin5 = self.env["pms.checkin.partner"].create(
+            {
+                "partner_id": self.partner_5.id,
+                "reservation_id": self.reservation_3.id,
+            }
+        )
+        # Create extra bed service
+        product_extra_bed = self.env["product.product"].create(
+            {
+                "name": "Product test",
+                "is_extra_bed": True,
+                "consumed_on": "before",
+                "per_day": True,
+            }
+        )
+        vals_service_extra_bed = {
+            "is_board_service": False,
+            "product_id": product_extra_bed.id,
+        }
+        # Create reservation 4
+        self.reservation_4 = self.env["pms.reservation"].create(
+            {
+                "checkin": datetime.date.today() + datetime.timedelta(days=1),
+                "checkout": datetime.date.today() + datetime.timedelta(days=3),
+                "preferred_room_id": self.room_single_1.id,
+                "partner_id": self.partner_6.id,
+                "adults": 2,
+                "pms_property_id": self.pms_property1.id,
+                "service_ids": [(0, 0, vals_service_extra_bed)],
+            }
+        )
+        self.checkin6 = self.env["pms.checkin.partner"].create(
+            {
+                "partner_id": self.partner_6.id,
+                "reservation_id": self.reservation_4.id,
+            }
+        )
+
+        self.checkin7 = self.env["pms.checkin.partner"].create(
+            {
+                "partner_id": self.partner_7.id,
+                "reservation_id": self.reservation_4.id,
+            }
+        )
+        # checkin partners on board
+        self.checkin1.action_on_board()
+        self.checkin2.action_on_board()
+        with freeze_time("2021-02-02"):
+            self.checkin3.action_on_board()
+            self.checkin4.action_on_board()
+            self.checkin5.action_on_board()
+            self.checkin6.action_on_board()
+            self.checkin7.action_on_board()
+
+        # set prices for nights
+        self.reservation_1.reservation_line_ids[0].price = 25.0
+        self.reservation_2.reservation_line_ids[0].price = 21.0
+        self.reservation_3.reservation_line_ids[0].price = 25.0
+        self.reservation_3.reservation_line_ids[1].price = 25.0
+        self.reservation_4.reservation_line_ids[0].price = 21.50
+        self.reservation_4.reservation_line_ids[1].price = 21.50
+
+    def test_room_type_num_by_date(self):
+        """
+        +============================+==============+==============+=============+
+        |                            |      01      |      02      |     03      |
+        +============================+==============+==============+=============+
+        | r1  2 adults               | DOUBLE ROOM  |              |             |
+        | r2  2 adults               |              | TRIPLE ROOM  |             |
+        | r3  1 adult                |              | DOUBLE ROOM  | DOUBLE ROOM |
+        | r4  2 adults (1 extra bed) |              | SINGLE ROOM  | SINGLE ROOM |
+        +============================+==============+==============+=============+
+        | double rooms (use double)  |      1       |      0       |      0      |
+        +============================+==============+==============+=============+
+        | double rooms (use single)  |      0       |      1       |      1      |
+        +============================+==============+==============+=============+
+        | other rooms                |      0       |      2       |      1      |
+        +============================+==============+==============+=============+
+        | extra beds                 |      0       |      1       |      1      |
+        +============================+==============+==============+=============+
+        """
+        # ARRANGE
+        start_date = datetime.date(2021, 2, 1)
+        second_date = datetime.date(2021, 2, 2)
+        end_date = datetime.date(2021, 2, 3)
+
+        expected_result = {
+            start_date: {
+                "double_rooms_double_use": 1,
+                "double_rooms_single_use": 0,
+                "other_rooms": 0,
+                "extra_beds": 0,
+            },
+            second_date: {
+                "double_rooms_double_use": 0,
+                "double_rooms_single_use": 1,
+                "other_rooms": 2,
+                "extra_beds": 1,
+            },
+            end_date: {
+                "double_rooms_double_use": 0,
+                "double_rooms_single_use": 1,
+                "other_rooms": 1,
+                "extra_beds": 1,
+            },
+        }
+
+        # ACT
+        rooms = self.env["pms.ine.wizard"].ine_rooms(
+            start_date, end_date, self.pms_property1
+        )
+        # ASSERT
+        self.assertDictEqual(rooms, expected_result)
+
+    def test_arrivals_departures_pernoctations_by_date(self):
+        """
+        +===========================+==============+==============+=============+=============+
+        |                           |      01      |      02      |     03      |   04        |
+        +===========================+==============+==============+=============+=============+
+        | r1  2 adults              | italy,russia | italy,russia |             |             |
+        +---------------------------+--------------+--------------+-------------+-------------+
+        | r2  2 adults              |              | italy,italy  | italy,italy |             |
+        +---------------------------+--------------+--------------+-------------+-------------+
+        | r3  1 adult               |              | afghanistan  | afghanistan | afghanistan |
+        +---------------------------+--------------+--------------+-------------+-------------+
+        | r4  2 adults              |              | afghanistan  | afghanistan | afghanistan |
+        |                           |              | afghanistan  | afghanistan | afghanistan |
+        +===========================+==============+==============+=============+=============+
+        | arrivals  Afghanistan     |              | 3            |             |             |
+        | arrivals  Italy           | 1            | 2            |             |             |
+        | arrivals  Russia          | 1            |              |             |             |
+        +===========================+==============+==============+=============+=============+
+        | pernoctations Afghanistan |              | 3            | 3           |             |
+        | pernoctations Italy       | 1            | 2            |             |             |
+        | pernoctations Russia      | 1            |              |             |             |
+        +===========================+==============+==============+=============+=============+
+        | departures Afghanistan    |              |              |             | 3           |
+        | departures Italy          |              | 1            | 2           |             |
+        | departures Russia         |              | 1            |             |             |
+        +===========================+==============+==============+=============+=============+
+        """
+        # ARRANGE
+        start_date = datetime.date(2021, 2, 1)
+        second_date = datetime.date(2021, 2, 2)
+        third_date = datetime.date(2021, 2, 3)
+        end_date = datetime.date(2021, 2, 4)
+
+        expected_result = {
+            self.country_afghanistan.code: {
+                second_date: {
+                    "arrivals": 3,
+                    "pernoctations": 3,
+                },
+                third_date: {
+                    "pernoctations": 3,
+                },
+                end_date: {
+                    "departures": 3,
+                },
+            },
+            self.country_italy.code: {
+                start_date: {
+                    "arrivals": 1,
+                    "pernoctations": 1,
+                },
+                second_date: {
+                    "arrivals": 2,
+                    "pernoctations": 2,
+                    "departures": 1,
+                },
+                third_date: {
+                    "departures": 2,
+                },
+            },
+            self.country_russia.code: {
+                start_date: {
+                    "arrivals": 1,
+                    "pernoctations": 1,
+                },
+                second_date: {
+                    "departures": 1,
+                },
+            },
+        }
+        # ACT
+        nationalities = self.env["pms.ine.wizard"].ine_nationalities(
+            start_date, end_date, self.pms_property1.id
+        )
+        # ASSERT
+        self.assertDictEqual(nationalities, expected_result)
+
+    def test_spain_arrivals_departures_pernoctations_by_date(self):
+        """
+        +==========================+============+============+=========+========+
+        |                          |     01     |     02     |   03    |   04   |
+        +==========================+============+============+=========+========+
+        | r1  2 adults             | Ourense    | Ourense    |         |        |
+        |                          | Pontevedra | Pontevedra |         |        |
+        +--------------------------+------------+------------+---------+--------+
+        | r2  2 adults             |            | Ourense    | Ourense |        |
+        |                          |            | Ourense    | Ourense |        |
+        +--------------------------+------------+------------+---------+--------+
+        | r3  1 adult              |            | Madrid     | Madrid  | Madrid |
+        +--------------------------+------------+------------+---------+--------+
+        | r4  2 adults             |            | Madrid     | Madrid  | Madrid |
+        |                          |            | Madrid     | Madrid  | Madrid |
+        +==========================+============+============+=========+========+
+        | arrivals  Madrid         |            | 3          |         |        |
+        | arrivals  Ourense        | 1          | 2          |         |        |
+        | arrivals  Pontevedra     | 1          |            |         |        |
+        +==========================+============+============+=========+========+
+        | pernoctations Madrid     |            | 3          | 3       |        |
+        | pernoctations Ourense    | 1          | 2          |         |        |
+        | pernoctations Pontevedra | 1          |            |         |        |
+        0+=========================+============+============+=========+========+
+        | departures Madrid        |            |            |         | 3      |
+        | departures Ourense       |            | 1          | 2       |        |
+        | departures Pontevedra    |            | 1          |         |        |
+        +==========================+============+============+=========+========+
+        """
+        # ARRANGE
+        start_date = datetime.date(2021, 2, 1)
+        second_date = datetime.date(2021, 2, 2)
+        third_date = datetime.date(2021, 2, 3)
+        end_date = datetime.date(2021, 2, 4)
+
+        country_spain = self.env["res.country"].search([("code", "=", "ES")])
+        state_madrid = self.env["res.country.state"].search([("name", "=", "Madrid")])
+        state_ourense = self.env["res.country.state"].search(
+            [("name", "=", "Ourense (Orense)")]
+        )
+        state_pontevedra = self.env["res.country.state"].search(
+            [("name", "=", "Pontevedra")]
+        )
+
+        self.checkin1.nationality_id = country_spain
+        self.partner_1.nationality_id = country_spain
+        self.checkin1.state_id = state_ourense
+        self.partner_1.state_id = state_ourense
+
+        self.checkin2.nationality_id = country_spain
+        self.partner_2.nationality_id = country_spain
+        self.checkin2.state_id = state_pontevedra
+        self.partner_2.state_id = state_pontevedra
+
+        self.checkin3.nationality_id = country_spain
+        self.partner_3.nationality_id = country_spain
+        self.checkin3.state_id = state_ourense
+        self.partner_3.state_id = state_ourense
+
+        self.checkin4.nationality_id = country_spain
+        self.partner_4.nationality_id = country_spain
+        self.checkin4.state_id = state_ourense
+        self.partner_4.state_id = state_ourense
+
+        self.checkin5.nationality_id = country_spain
+        self.partner_5.nationality_id = country_spain
+        self.checkin5.state_id = state_madrid
+        self.partner_5.state_id = state_madrid
+
+        self.checkin6.nationality_id = country_spain
+        self.partner_6.nationality_id = country_spain
+        self.checkin6.state_id = state_madrid
+        self.partner_6.state_id = state_madrid
+
+        self.checkin7.nationality_id = country_spain
+        self.partner_7.nationality_id = country_spain
+        self.checkin7.state_id = state_madrid
+        self.partner_7.state_id = state_madrid
+
+        expected_result = {
+            country_spain.code: {
+                state_madrid.ine_code: {
+                    second_date: {
+                        "arrivals": 3,
+                        "pernoctations": 3,
+                    },
+                    third_date: {
+                        "pernoctations": 3,
+                    },
+                    end_date: {
+                        "departures": 3,
+                    },
+                },
+                state_ourense.ine_code: {
+                    start_date: {
+                        "arrivals": 1,
+                        "pernoctations": 1,
+                    },
+                    second_date: {
+                        "arrivals": 2,
+                        "pernoctations": 2,
+                        "departures": 1,
+                    },
+                    third_date: {
+                        "departures": 2,
+                    },
+                },
+                state_pontevedra.ine_code: {
+                    start_date: {
+                        "arrivals": 1,
+                        "pernoctations": 1,
+                    },
+                    second_date: {
+                        "departures": 1,
+                    },
+                },
+            }
+        }
+        # ACT
+        nationalities = self.env["pms.ine.wizard"].ine_nationalities(
+            start_date, end_date, self.pms_property1.id
+        )
+        # ASSERT
+        self.assertDictEqual(nationalities, expected_result)
+
+    def test_calculate_monthly_adr(self):
+        """
+        +-------------+-------+-------+-------+
+        |             |  01   |  02   |  03   |
+        +-------------+-------+-------+-------+
+        | r1          | 25.00 |       |       |
+        | r2          |       | 21.00 |       |
+        | r3          |       | 25.00 | 25.00 |
+        | r4          |       | 21.50 | 21.50 |
+        +-------------+-------+-------+-------+
+        | adr         | 25.00 | 22.50 | 23.25 |
+        +-------------+-------+-------+-------+
+        | monthly adr |        23.58          |
+        +-------------+-------+-------+-------+
+        """
+        # ARRANGE
+        start_date = datetime.date(2021, 2, 1)
+        expected_monthly_adr = 23.58
+
+        # ACT
+        monthly_adr = self.env["pms.ine.wizard"].ine_calculate_monthly_adr(
+            start_date, self.pms_property1.id
+        )
+        # ASSERT
+        self.assertEqual(
+            expected_monthly_adr,
+            monthly_adr,
+        )
+
+    def test_calculate_monthly_revpar(self):
+        """
+        +----------------+-------+-------+-------+
+        |                |  01   |  02   |  03   |
+        +----------------+-------+-------+-------+
+        | r1             | 25.00 |       |       |
+        | r2             |       | 21.00 |       |
+        | r3             |       | 25.00 | 25.00 |
+        | r4             |       | 21.50 | 21.50 |
+        +----------------+-------+-------+-------+
+        | monthly revpar |        23.58          |
+        +----------------+-------+-------+-------+
+        num rooms avail. = 4
+        income = 25.00 + 21.00 + 25.00 + 25.00 + 21.50 + 21.50 = 139
+        monthly revpar = 139 / (4 * 28)
+        """
+        # ARRANGE
+        start_date = datetime.date(2021, 2, 1)
+        expected_monthly_revpar = 1.24
+
+        # ACT
+        monthly_revpar = self.env["pms.ine.wizard"].ine_calculate_monthly_revpar(
+            start_date, self.pms_property1.id
+        )
+        # ASSERT
+        self.assertEqual(
+            expected_monthly_revpar,
+            monthly_revpar,
+        )
diff --git a/pms_l10n_es/views/pms_ine_tourism_type_category.xml b/pms_l10n_es/views/pms_ine_tourism_type_category.xml
new file mode 100644
index 00000000000..a84c48cb876
--- /dev/null
+++ b/pms_l10n_es/views/pms_ine_tourism_type_category.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record model="ir.ui.view" id="pms_ine_tourism_category_view_form">
+        <field name="name">pms.ine.tourism.category.form</field>
+        <field name="model">pms.ine.tourism.type.category</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <group>
+                        <field name="type" />
+                        <field name="category" />
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="pms_ine_tourism_category_view_tree">
+        <field name="name">pms.ine.tourism.category.tree</field>
+        <field name="model">pms.ine.tourism.type.category</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="type" />
+                <field name="category" />
+            </tree>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="open_pms_ine_tourism_category">
+        <field name="name">INE Categories</field>
+        <field name="res_model">pms.ine.tourism.type.category</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+    <!--    <menuitem-->
+    <!--        name="INE Tourism Categories"-->
+    <!--        id="menu_open_pms_ine_tourism_category_form_tree"-->
+    <!--        action="open_pms_ine_tourism_category"-->
+    <!--        parent="pms.menu_reservations"-->
+    <!--        sequence="30"-->
+    <!--    />-->
+</odoo>
diff --git a/pms_l10n_es/views/pms_property_views.xml b/pms_l10n_es/views/pms_property_views.xml
index 117bc16e52b..6e0e8390040 100644
--- a/pms_l10n_es/views/pms_property_views.xml
+++ b/pms_l10n_es/views/pms_property_views.xml
@@ -34,6 +34,27 @@
                         />
                     </div>
                 </div>
+                <div class="row">
+                    <div class="col-12">
+                        <div class="o_horizontal_separator">
+                            INE Settings
+                        </div>
+                    </div>
+                    <div class="col-6">
+                        <group>
+                            <field name="ine_tourism_number" />
+                            <field name="ine_category_id" />
+                        </group>
+                    </div>
+                    <div class="col-6">
+                        <group>
+                            <field name="ine_seats" />
+                            <field name="ine_permanent_staff" />
+                            <field name="ine_eventual_staff" />
+                            <field name="ine_unpaid_staff" />
+                        </group>
+                    </div>
+                </div>
             </xpath>
         </field>
     </record>
diff --git a/pms_l10n_es/views/pms_room_views.xml b/pms_l10n_es/views/pms_room_views.xml
new file mode 100644
index 00000000000..820fceaa943
--- /dev/null
+++ b/pms_l10n_es/views/pms_room_views.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="view_room_form_pms_l10n_es" model="ir.ui.view">
+        <field name="name">Property Form l10n_es</field>
+        <field name="model">pms.room</field>
+        <field name="inherit_id" ref="pms.pms_room_view_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='sequence']" position="after">
+                 <field name="in_ine" />
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/pms_l10n_es/wizards/__init__.py b/pms_l10n_es/wizards/__init__.py
index 1a18223f30b..52c12cbc4aa 100644
--- a/pms_l10n_es/wizards/__init__.py
+++ b/pms_l10n_es/wizards/__init__.py
@@ -1 +1,2 @@
 from . import traveller_report
+from . import wizard_ine
diff --git a/pms_l10n_es/wizards/wizard_ine.py b/pms_l10n_es/wizards/wizard_ine.py
new file mode 100644
index 00000000000..416ddff22bd
--- /dev/null
+++ b/pms_l10n_es/wizards/wizard_ine.py
@@ -0,0 +1,680 @@
+import base64
+import calendar
+import datetime
+import xml.etree.cElementTree as ET
+
+from odoo import _, api, fields, models
+from odoo.exceptions import ValidationError
+
+# TODO: Review code (code iso ?)
+CODE_SPAIN = "ES"
+
+
+class WizardIne(models.TransientModel):
+    _name = "pms.ine.wizard"
+    _description = "Wizard to generate statistical info."
+
+    pms_property_id = fields.Many2one(
+        string="Property",
+        comodel_name="pms.property",
+        default=lambda self: self.env["pms.property"].browse(
+            self.env.user.get_active_property_ids()[0]
+        ),
+        check_pms_properties=True,
+        required=True,
+    )
+
+    txt_filename = fields.Text()
+    txt_binary = fields.Binary(string="File Download")
+    txt_message = fields.Char(string="File Preview")
+
+    start_date = fields.Date(
+        string="From",
+        required=True,
+    )
+    end_date = fields.Date(
+        string="To",
+        required=True,
+    )
+
+    adr = fields.Float(string="Monthly ADR")
+    revpar = fields.Float(string="Monthly RevPAR")
+
+    @api.model
+    def ine_rooms(self, start_date, end_date, pms_property_id):
+        """
+        Returns a dictionary:
+        {
+            date_1: {
+                'double_rooms_single_use': number,
+                'double_rooms_double_use': number,
+                'other_rooms': number,
+                'extra_beds': number
+            },
+            # ... more dates
+        }
+        """
+        # result object
+        rooms = dict()
+
+        # iterate days between start_date and end_date
+        for p_date in [
+            start_date + datetime.timedelta(days=x)
+            for x in range(0, (end_date - start_date).days + 1)
+        ]:
+
+            # rooms with capacity 2 but only 1 adult using them
+            double_rooms_single_use = (
+                self.env["pms.reservation.line"]
+                .search(
+                    [
+                        ("pms_property_id", "=", pms_property_id.id),
+                        ("occupies_availability", "=", True),
+                        ("reservation_id.reservation_type", "=", "normal"),
+                        ("room_id.in_ine", "=", True),
+                        ("date", "=", p_date),
+                        ("room_id.capacity", "=", 2),
+                        ("reservation_id.adults", "=", 1),
+                    ]
+                )
+                .mapped("room_id")
+            )
+
+            # rooms with capacity 2 with 2 adult using them
+            double_rooms_double_use = (
+                self.env["pms.reservation.line"]
+                .search(
+                    [
+                        ("pms_property_id", "=", pms_property_id.id),
+                        ("occupies_availability", "=", True),
+                        ("reservation_id.reservation_type", "=", "normal"),
+                        ("room_id.in_ine", "=", True),
+                        ("date", "=", p_date),
+                        ("room_id.capacity", "=", 2),
+                        ("reservation_id.adults", "=", 2),
+                    ]
+                )
+                .mapped("room_id")
+            )
+
+            # service lines with extra beds
+            extra_bed_service_lines = self.env["pms.service.line"].search(
+                [
+                    ("pms_property_id", "=", pms_property_id.id),
+                    ("product_id.is_extra_bed", "=", True),
+                    ("reservation_id.reservation_type", "=", "normal"),
+                    ("date", "=", p_date),
+                ]
+            )
+
+            extra_beds = 0
+
+            # get num. extra beds
+            for ebsl in extra_bed_service_lines:
+                reservation_lines = ebsl.reservation_id.reservation_line_ids.filtered(
+                    lambda x: x.date == ebsl.date
+                    and x.room_id.in_ine
+                    and x.occupies_availability
+                )
+                if reservation_lines:
+                    extra_beds += (
+                        ebsl.day_qty
+                        - reservation_lines.reservation_id.children_occupying
+                    )
+                    # children occuppying do not have checkin partner data
+
+            # search all rooms
+            all_rooms = (
+                self.env["pms.reservation.line"]
+                .search(
+                    [
+                        ("date", "=", p_date),
+                        ("occupies_availability", "=", True),
+                        ("reservation_id.reservation_type", "=", "normal"),
+                        ("room_id.in_ine", "=", True),
+                        ("pms_property_id", "=", pms_property_id.id),
+                    ]
+                )
+                .mapped("room_id")
+            )
+
+            # other rooms = all rooms - double rooms
+            other_rooms = (
+                all_rooms - double_rooms_double_use
+            ) - double_rooms_single_use
+
+            # no room movements -> no dict entrys
+            if not (
+                extra_beds == 0
+                and len(other_rooms) == 0
+                and len(double_rooms_double_use) == 0
+                and len(double_rooms_single_use) == 0
+            ):
+                # create result dict for each date
+                rooms[p_date] = dict()
+                rooms[p_date]["double_rooms_single_use"] = len(double_rooms_single_use)
+                rooms[p_date]["double_rooms_double_use"] = len(double_rooms_double_use)
+                rooms[p_date]["other_rooms"] = len(other_rooms)
+                rooms[p_date]["extra_beds"] = extra_beds
+        return rooms
+
+    @api.model
+    def ine_nationalities(self, start_date, end_date, pms_property_id):
+        """
+        Returns a dictionary:
+        {
+            CODE_SPAIN: {
+                state.code_ine: {
+                    date: {
+                        'arrivals': number,
+                        'departures': number,
+                        'pernoctations': number,
+                    },
+                    # ... more dates
+                },
+                # ... more ine codes from spain
+            },
+            # ... more countries (except Spain)
+            country.code_alpha3: {
+                date: {
+                    'arrivals': num. of arrivals
+                    'departures': num. of departures
+                    'pernoctations': num. of pernoctations
+                },
+                # ... more dates
+            },
+            # ... more countries (except Spain)
+        }
+        """
+
+        def ine_add_arrivals_departures_pernoctations(
+            date, type_of_entry, read_group_result
+        ):
+            """
+            date = date to add the entry to dic
+            type_of_entry =  'arrivals' | 'departures' | 'pernoctations'
+            read_group_result = result of read_group by type_of_entry
+
+            """
+
+            for entry in read_group_result:
+                # get nationality_id from group set read_group results
+                nationality_id_code = (
+                    self.env["res.country"]
+                    .search([("id", "=", entry["nationality_id"][0])])
+                    .code
+                )
+                # all countries except Spain
+                if nationality_id_code != CODE_SPAIN:
+
+                    # get count of each result
+                    num = entry["__count"]
+
+                    # update/create dicts for countries & dates and set num. arrivals
+                    if not nationalities.get(nationality_id_code):
+                        nationalities[nationality_id_code] = dict()
+                    if not nationalities[nationality_id_code].get(date):
+                        nationalities[nationality_id_code][date] = dict()
+                    nationalities[nationality_id_code][date][type_of_entry] = num
+                else:
+                    # arrivals grouped by state_id (Spain "provincias")
+                    read_by_arrivals_spain = self.env["res.partner"].read_group(
+                        entry["__domain"],
+                        ["state_id"],
+                        ["state_id"],
+                        lazy=False,
+                    )
+                    # iterate read_group results from Spain
+                    for entry_from_spain in read_by_arrivals_spain:
+                        state_id = self.env["res.country.state"].browse(
+                            entry_from_spain["state_id"][0]
+                        )  # .ine_code
+                        ine_code = state_id.ine_code
+
+                        # get count of each result
+                        num_spain = entry_from_spain["__count"]
+
+                        # update/create dicts for states & dates and set num. arrivals
+                        if not nationalities.get(CODE_SPAIN):
+                            nationalities[CODE_SPAIN] = dict()
+
+                        if not nationalities[CODE_SPAIN].get(ine_code):
+                            nationalities[CODE_SPAIN][ine_code] = dict()
+
+                        if not nationalities[CODE_SPAIN][ine_code].get(date):
+                            nationalities[CODE_SPAIN][ine_code][date] = dict()
+
+                        nationalities[CODE_SPAIN][ine_code][date][
+                            type_of_entry
+                        ] = num_spain
+
+        # result object
+        nationalities = dict()
+
+        # iterate days between start_date and end_date
+        for p_date in [
+            start_date + datetime.timedelta(days=x)
+            for x in range(0, (end_date - start_date).days + 1)
+        ]:
+            # search for checkin partners
+            hosts = self.env["pms.checkin.partner"].search(
+                [
+                    ("partner_id", "!=", False),
+                    ("pms_property_id", "=", pms_property_id),
+                    ("checkin", "<=", p_date),
+                    ("checkout", ">=", p_date),
+                ]
+            )
+
+            # only checkin partners housed in "in_ine" rooms
+            hosts = hosts.filtered(
+                lambda x: x.reservation_id.reservation_line_ids.mapped("room_id").in_ine
+            )
+
+            # arrivals
+            arrivals = hosts.filtered(lambda x: x.checkin == p_date)
+
+            # arrivals grouped by nationality_id
+            read_by_arrivals = self.env["res.partner"].read_group(
+                [("id", "in", arrivals.mapped("partner_id").ids)],
+                ["nationality_id"],
+                ["nationality_id"],
+                lazy=False,
+            )
+
+            # departures
+            departures = hosts.filtered(lambda x: x.checkout == p_date)
+
+            # departures grouped by nationality_id
+            read_by_departures = self.env["res.partner"].read_group(
+                [("id", "in", departures.mapped("partner_id").ids)],
+                ["nationality_id"],
+                ["nationality_id"],
+                lazy=False,
+            )
+
+            # pernoctations
+            pernoctations = hosts - departures
+
+            # pernoctations grouped by nationality_id
+            read_by_pernoctations = self.env["res.partner"].read_group(
+                [("id", "in", pernoctations.mapped("partner_id").ids)],
+                ["nationality_id"],
+                ["nationality_id"],
+                lazy=False,
+            )
+
+            ine_add_arrivals_departures_pernoctations(
+                p_date, "arrivals", read_by_arrivals
+            )
+            ine_add_arrivals_departures_pernoctations(
+                p_date, "departures", read_by_departures
+            )
+            ine_add_arrivals_departures_pernoctations(
+                p_date, "pernoctations", read_by_pernoctations
+            )
+
+        return nationalities
+
+    @api.model
+    def ine_calculate_monthly_adr(self, start_date, pms_property_id):
+        month = start_date.month
+        year = start_date.year
+        month_range = calendar.monthrange(start_date.year, start_date.month)
+        first_day = datetime.date(year, month, 1)
+        last_day = datetime.date(year, month, month_range[1])
+        group_adr = self.env["pms.reservation.line"].read_group(
+            [
+                ("pms_property_id", "=", pms_property_id),
+                ("occupies_availability", "=", True),
+                ("reservation_id.reservation_type", "=", "normal"),
+                ("room_id.in_ine", "=", True),
+                ("date", ">=", first_day),
+                ("date", "<=", last_day),
+            ],
+            ["price:avg"],
+            ["date:day"],
+        )
+        if not len(group_adr):
+            return 0
+        adr = 0
+        for day_adr in group_adr:
+            adr += day_adr["price"]
+
+        adr = round(adr / len(group_adr), 2)
+        self.adr = adr
+        return adr
+
+    @api.model
+    def ine_calculate_monthly_revpar(self, start_date, pms_property_id):
+        month = start_date.month
+        year = start_date.year
+        month_range = calendar.monthrange(start_date.year, start_date.month)
+        first_day = datetime.date(year, month, 1)
+        last_day = datetime.date(year, month, month_range[1])
+        sum_group_price = self.env["pms.reservation.line"].read_group(
+            [
+                ("pms_property_id", "=", pms_property_id),
+                ("occupies_availability", "=", True),
+                ("reservation_id.reservation_type", "=", "normal"),
+                ("room_id.in_ine", "=", True),
+                ("date", ">=", first_day),
+                ("date", "<=", last_day),
+            ],
+            ["price"],
+            [],
+        )
+        rooms_not_allowed = (
+            self.env["pms.reservation.line"]
+            .search(
+                [
+                    ("pms_property_id", "=", pms_property_id),
+                    ("occupies_availability", "=", True),
+                    ("reservation_id.reservation_type", "!=", "normal"),
+                ]
+            )
+            .mapped("room_id")
+            .ids
+        )
+        available_rooms = self.env["pms.room"].search_count(
+            [
+                ("in_ine", "=", True),
+                ("pms_property_id", "=", pms_property_id),
+                ("id", "not in", rooms_not_allowed),
+            ]
+        )
+        if not sum_group_price[0]["price"]:
+            return 0
+        revpar = round(
+            sum_group_price[0]["price"] / (available_rooms * last_day.day), 2
+        )
+        self.revpar = revpar
+        return revpar
+
+    @api.model
+    def ine_get_nif_cif(self, cif_nif):
+        country_codes = self.env["res.country"].search([]).mapped("code")
+        if cif_nif[:2] in country_codes:
+            return cif_nif[2:].strip()
+        return cif_nif.strip()
+
+    @api.model
+    def check_ine_mandatory_fields(self, pms_property_id):
+        if not pms_property_id.name:
+            raise ValidationError(_("The property name is not established."))
+
+        if not pms_property_id.company_id.vat:
+            raise ValidationError(_("The company VAT is not established."))
+
+        if not pms_property_id.company_id.name:
+            raise ValidationError(_("The company name is not established."))
+
+        if not pms_property_id.name:
+            raise ValidationError(_("The property name is not established."))
+
+        if not pms_property_id.ine_tourism_number:
+            raise ValidationError(_("The property tourism number is not established."))
+
+        if not pms_property_id.ine_tourism_number:
+            raise ValidationError(_("The property tourism number is not established."))
+
+        if not pms_property_id.street:
+            raise ValidationError(_("The property street is not established."))
+
+        if not pms_property_id.zip:
+            raise ValidationError(_("The property zip is not established."))
+
+        if not pms_property_id.city:
+            raise ValidationError(_("The property city is not established."))
+
+        if not pms_property_id.partner_id.state_id:
+            raise ValidationError(_("The property state is not established."))
+
+        if not pms_property_id.phone:
+            raise ValidationError(_("The property phone is not established."))
+
+        if not pms_property_id.ine_category_id:
+            raise ValidationError(_("The property category is not established."))
+
+    def ine_generate_xml(self):
+
+        self.check_ine_mandatory_fields(self.pms_property_id)
+
+        if self.start_date.month != self.end_date.month:
+            raise ValidationError(_("The date range must belong to the same month."))
+
+        number_of_rooms = sum(
+            self.env["pms.room"]
+            .search(
+                [
+                    ("in_ine", "=", True),
+                    ("pms_property_id", "=", self.pms_property_id.id),
+                ]
+            )
+            .mapped("capacity")
+        )
+
+        if number_of_rooms > self.pms_property_id.ine_seats:
+            raise ValidationError(
+                _(
+                    "The number of seats, excluding extra beds (%s)"
+                    % str(number_of_rooms)
+                    + " exceeds the number of seats established in the property (%s)"
+                    % str(self.pms_property_id.ine_seats)
+                )
+            )
+
+        # INE XML
+        survey_tag = ET.Element("ENCUESTA")
+
+        # INE XML -> PROPERTY
+        header_tag = ET.SubElement(survey_tag, "CABECERA")
+        date = ET.SubElement(header_tag, "FECHA_REFERENCIA")
+        ET.SubElement(date, "MES").text = f"{self.start_date.month:02}"
+        ET.SubElement(date, "ANYO").text = str(self.start_date.year)
+        ET.SubElement(header_tag, "DIAS_ABIERTO_MES_REFERENCIA").text = str(
+            calendar.monthrange(self.start_date.year, self.start_date.month)[1]
+        )
+        ET.SubElement(
+            header_tag, "RAZON_SOCIAL"
+        ).text = self.pms_property_id.company_id.name
+        ET.SubElement(
+            header_tag, "NOMBRE_ESTABLECIMIENTO"
+        ).text = self.pms_property_id.name
+
+        ET.SubElement(header_tag, "CIF_NIF").text = self.ine_get_nif_cif(
+            self.pms_property_id.company_id.vat
+        )
+        ET.SubElement(
+            header_tag, "NUMERO_REGISTRO"
+        ).text = self.pms_property_id.ine_tourism_number
+        ET.SubElement(header_tag, "DIRECCION").text = self.pms_property_id.street
+        ET.SubElement(header_tag, "CODIGO_POSTAL").text = self.pms_property_id.zip
+        ET.SubElement(header_tag, "LOCALIDAD").text = self.pms_property_id.city
+        ET.SubElement(header_tag, "MUNICIPIO").text = self.pms_property_id.city
+        ET.SubElement(
+            header_tag, "PROVINCIA"
+        ).text = self.pms_property_id.partner_id.state_id.name
+        ET.SubElement(
+            header_tag, "TELEFONO_1"
+        ).text = self.pms_property_id.phone.replace(" ", "")[0:12]
+        ET.SubElement(
+            header_tag, "TIPO"
+        ).text = self.pms_property_id.ine_category_id.type
+        ET.SubElement(
+            header_tag, "CATEGORIA"
+        ).text = self.pms_property_id.ine_category_id.category
+        ET.SubElement(header_tag, "HABITACIONES").text = str(
+            self.env["pms.room"].search_count([("in_ine", "=", True)])
+        )
+
+        ET.SubElement(header_tag, "PLAZAS_DISPONIBLES_SIN_SUPLETORIAS").text = str(
+            self.pms_property_id.ine_seats
+        )
+        ET.SubElement(header_tag, "URL").text = self.pms_property_id.website
+
+        # INE XML -> GUESTS
+        accommodation_tag = ET.SubElement(survey_tag, "ALOJAMIENTO")
+
+        nationalities = self.ine_nationalities(
+            self.start_date, self.end_date, self.pms_property_id.id
+        )
+        for key_country, value_country in nationalities.items():
+
+            country = self.env["res.country"].search([("code", "=", key_country)])
+
+            if key_country != CODE_SPAIN:
+                residency_tag = ET.SubElement(accommodation_tag, "RESIDENCIA")
+                ET.SubElement(residency_tag, "ID_PAIS").text = country.code_alpha3
+
+                for key_date, value_dates in value_country.items():
+                    movement = ET.SubElement(residency_tag, "MOVIMIENTO")
+                    ET.SubElement(movement, "N_DIA").text = f"{key_date.day:02}"
+                    num_arrivals = (
+                        value_dates["arrivals"] if value_dates.get("arrivals") else 0
+                    )
+                    num_departures = (
+                        value_dates["departures"]
+                        if value_dates.get("departures")
+                        else 0
+                    )
+                    num_pernoctations = (
+                        value_dates["pernoctations"]
+                        if value_dates.get("pernoctations")
+                        else 0
+                    )
+
+                    ET.SubElement(movement, "ENTRADAS").text = str(num_arrivals)
+                    ET.SubElement(movement, "SALIDAS").text = str(num_departures)
+                    ET.SubElement(movement, "PERNOCTACIONES").text = str(
+                        num_pernoctations
+                    )
+            else:
+                for code_ine, value_state in value_country.items():
+                    residency_tag = ET.SubElement(accommodation_tag, "RESIDENCIA")
+                    ET.SubElement(residency_tag, "ID_PROVINCIA_ISLA").text = code_ine
+                    for key_date, value_dates in value_state.items():
+                        movement = ET.SubElement(residency_tag, "MOVIMIENTO")
+                        ET.SubElement(movement, "N_DIA").text = f"{key_date.day:02}"
+                        num_arrivals = (
+                            value_dates["arrivals"]
+                            if value_dates.get("arrivals")
+                            else 0
+                        )
+                        num_departures = (
+                            value_dates["departures"]
+                            if value_dates.get("departures")
+                            else 0
+                        )
+                        num_pernoctations = (
+                            value_dates["pernoctations"]
+                            if value_dates.get("pernoctations")
+                            else 0
+                        )
+                        ET.SubElement(movement, "ENTRADAS").text = str(num_arrivals)
+                        ET.SubElement(movement, "SALIDAS").text = str(num_departures)
+                        ET.SubElement(movement, "PERNOCTACIONES").text = str(
+                            num_pernoctations
+                        )
+
+        rooms_tag = ET.SubElement(survey_tag, "HABITACIONES")
+        rooms = self.ine_rooms(self.start_date, self.end_date, self.pms_property_id)
+        # INE XML -> ROOMS
+        for key_date, value_rooms in rooms.items():
+
+            rooms_move = ET.SubElement(rooms_tag, "HABITACIONES_MOVIMIENTO")
+            ET.SubElement(rooms_move, "HABITACIONES_N_DIA").text = f"{key_date.day:02}"
+            ET.SubElement(rooms_move, "PLAZAS_SUPLETORIAS").text = str(
+                value_rooms["extra_beds"]
+            )
+            ET.SubElement(rooms_move, "HABITACIONES_DOBLES_USO_DOBLE").text = str(
+                value_rooms["double_rooms_double_use"]
+            )
+            ET.SubElement(rooms_move, "HABITACIONES_DOBLES_USO_INDIVIDUAL").text = str(
+                value_rooms["double_rooms_single_use"]
+            )
+            ET.SubElement(rooms_move, "HABITACIONES_OTRAS").text = str(
+                value_rooms["other_rooms"]
+            )
+        prices_tag = ET.SubElement(survey_tag, "PRECIOS")
+
+        ET.SubElement(prices_tag, "REVPAR_MENSUAL").text = str(
+            self.ine_calculate_monthly_revpar(
+                self.start_date,
+                self.pms_property_id.id,
+            )
+        )
+
+        ET.SubElement(prices_tag, "ADR_MENSUAL").text = str(
+            self.ine_calculate_monthly_adr(
+                self.start_date,
+                self.pms_property_id.id,
+            )
+        )
+
+        # TODO:
+        #  Evaluate how to get occupation & ADR for:
+        #       -traditional/online tour-operator
+        #       -traditional/online agency
+        #       -companys
+
+        ET.SubElement(prices_tag, "ADR_TOUROPERADOR_TRADICIONAL").text = "0"
+        ET.SubElement(
+            prices_tag, "PCTN_HABITACIONES_OCUPADAS_TOUROPERADOR_TRADICIONAL"
+        ).text = "0"
+        ET.SubElement(prices_tag, "ADR_TOUROPERADOR_ONLINE").text = "0"
+        ET.SubElement(
+            prices_tag, "PCTN_HABITACIONES_OCUPADAS_TOUROPERADOR_ONLINE"
+        ).text = "0"
+        ET.SubElement(prices_tag, "ADR_EMPRESAS").text = "0"
+        ET.SubElement(prices_tag, "PCTN_HABITACIONES_OCUPADAS_EMPRESAS").text = "0"
+        ET.SubElement(prices_tag, "ADR_AGENCIA_DE_VIAJE_TRADICIONAL").text = "0"
+        ET.SubElement(
+            prices_tag, "PCTN_HABITACIONES_OCUPADAS_AGENCIA_TRADICIONAL"
+        ).text = "0"
+        ET.SubElement(prices_tag, "ADR_AGENCIA_DE_VIAJE_ONLINE").text = "0"
+        ET.SubElement(
+            prices_tag, "PCTN_HABITACIONES_OCUPADAS_AGENCIA_ONLINE"
+        ).text = "0"
+        ET.SubElement(prices_tag, "ADR_PARTICULARES").text = "0"
+        ET.SubElement(prices_tag, "PCTN_HABITACIONES_OCUPADAS_PARTICULARES").text = "0"
+        ET.SubElement(prices_tag, "ADR_GRUPOS").text = "0"
+        ET.SubElement(prices_tag, "PCTN_HABITACIONES_OCUPADAS_GRUPOS").text = "0"
+        ET.SubElement(prices_tag, "ADR_INTERNET").text = "0"
+        ET.SubElement(prices_tag, "PCTN_HABITACIONES_OCUPADAS_INTERNET").text = "0"
+        ET.SubElement(prices_tag, "ADR_OTROS").text = "0"
+        ET.SubElement(prices_tag, "PCTN_HABITACIONES_OCUPADAS_OTROS").text = "0"
+
+        staff_tag = ET.SubElement(survey_tag, "PERSONAL_OCUPADO")
+        ET.SubElement(staff_tag, "PERSONAL_NO_REMUNERADO").text = str(
+            self.pms_property_id.ine_unpaid_staff
+        )
+        ET.SubElement(staff_tag, "PERSONAL_REMUNERADO_FIJO").text = str(
+            self.pms_property_id.ine_permanent_staff
+        )
+        ET.SubElement(staff_tag, "PERSONAL_REMUNERADO_EVENTUAL").text = str(
+            self.pms_property_id.ine_eventual_staff
+        )
+
+        xmlstr = '<?xml version="1.0" encoding="ISO-8859-1"?>'
+        xmlstr += ET.tostring(survey_tag).decode("utf-8")
+
+        self.txt_binary = base64.b64encode(str.encode(xmlstr))
+        self.txt_filename = (
+            "INE_"
+            + str(self.start_date.month)
+            + "_"
+            + str(self.start_date.year)
+            + ".xml"
+        )
+
+        return {
+            "context": self.env.context,
+            "view_type": "form",
+            "view_mode": "form",
+            "res_model": "pms.ine.wizard",
+            "res_id": self.id,
+            "view_id": False,
+            "type": "ir.actions.act_window",
+            "target": "new",
+        }
diff --git a/pms_l10n_es/wizards/wizard_ine.xml b/pms_l10n_es/wizards/wizard_ine.xml
new file mode 100644
index 00000000000..120f3ca139b
--- /dev/null
+++ b/pms_l10n_es/wizards/wizard_ine.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" ?>
+<odoo>
+    <record id="pms_ine_wizard" model="ir.ui.view">
+        <field name="name">INE</field>
+        <field name="model">pms.ine.wizard</field>
+        <field name="arch" type="xml">
+            <form>
+                <div class="row">
+                    <div class="col-6">
+                       <group>
+                           <field name="pms_property_id" />
+                       </group>
+                   </div>
+                    <div class="col-6">
+                        <group>
+                            <field
+                                name="start_date"
+                                widget="daterange"
+                                options="{'related_end_date': 'end_date'}"
+                            />
+                            <field
+                                name="end_date"
+                                widget="daterange"
+                                options="{'related_start_date': 'start_date'}"
+                            />
+                        </group>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-6">
+                        <group>
+                            <field name="txt_filename" invisible="1" />
+                            <field
+                                name="txt_binary"
+                                filename="txt_filename"
+                                readonly="1"
+                                attrs="{'invisible': [('txt_filename','=', False)]}"
+                            />
+                        </group>
+                    </div>
+                    <div class="col-6">
+                        <group>
+                            <field
+                                name="adr"
+                                attrs="{'invisible': [('txt_filename','=', False)]}"
+                                readonly="1"
+                            />
+                            <field
+                                name="revpar"
+                                attrs="{'invisible': [('txt_filename','=', False)]}"
+                                readonly="1"
+                            />
+                        </group>
+                    </div>
+                </div>
+
+                <div class="row">
+                    <div class="col-6">
+                        <button
+                            name="ine_generate_xml"
+                            class="btn btn-primary btn-sm"
+                            type="object"
+                            string="Generate INE XML"
+                        />
+                    </div>
+
+                    <div
+                        class="col-6"
+                        attrs="{'invisible': [('txt_filename','=', False)]}"
+                    >
+                        <b>
+                            <a
+                                href="https://arce.ine.es/ARCE/jsp/encuestaXml.jsp"
+                                target="_blank"
+                            >
+                                Send survey to Spanish National Institute of Statistics (INE)
+                                <i class="fa fa-signal" />
+                            </a>
+                        </b>
+                    </div>
+                </div>
+                <footer />
+            </form>
+        </field>
+    </record>
+
+    <record id="action_ine_report" model="ir.actions.act_window">
+        <field name="name">Generate INE file</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">pms.ine.wizard</field>
+        <field name="view_id" ref="pms_ine_wizard" />
+        <field name="view_mode">form</field>
+        <field name="target">new</field>
+    </record>
+    <menuitem
+        id="menu_ine"
+        name="Generate INE file"
+        sequence="31"
+        parent="pms.menu_reservations"
+        action="action_ine_report"
+    />
+</odoo>
diff --git a/requirements.txt b/requirements.txt
index 3e0e636687b..1fb3c55d7a2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
 # generated from manifests external_dependencies
 bs4
+pycountry
 xlrd