diff --git a/pms/demo/pms_folio.xml b/pms/demo/pms_folio.xml
index 63d8651b..bbc7e1f5 100644
--- a/pms/demo/pms_folio.xml
+++ b/pms/demo/pms_folio.xml
@@ -93,7 +93,7 @@
         <record id="pms_folio_4" model="pms.folio">
             <field name="partner_id" ref="main_pms_property" />
             <field name="user_id" ref="base.user_admin" />
-            <field name="reservation_type">out</field>
+            <field name="reservation_type">out_service</field>
             <field name="pms_property_id" ref="pms.main_pms_property" />
             <field
                 name="reservation_ids"
@@ -104,7 +104,7 @@
                     'checkout': (DateTime.today() + timedelta(days=17)),
                     'adults': 1,
                     'state': 'confirm',
-                    'reservation_type': 'out',
+                    'reservation_type': 'out_service',
                     'closure_reason_id': ref('pms_room_closure_reason_0'),
                     'out_service_description': 'Change of lighting',
                     })]"
@@ -225,7 +225,7 @@
         <record id="pms_folio_8" model="pms.folio">
             <field name="partner_id" ref="main_pms_property" />
             <field name="user_id" ref="base.user_admin" />
-            <field name="reservation_type">out</field>
+            <field name="reservation_type">out_service</field>
             <field name="pms_property_id" ref="pms.main_pms_property" />
             <field
                 name="reservation_ids"
@@ -236,7 +236,7 @@
                     'checkout': (DateTime.today() + timedelta(days=20)),
                     'adults': 1,
                     'state': 'confirm',
-                    'reservation_type': 'out',
+                    'reservation_type': 'out_service',
                     'closure_reason_id': ref('pms_room_closure_reason_0'),
                     'out_service_description': 'Door arrangement',
                     })]"
diff --git a/pms/demo/pms_reservation.xml b/pms/demo/pms_reservation.xml
index e2d41448..52c4909d 100644
--- a/pms/demo/pms_reservation.xml
+++ b/pms/demo/pms_reservation.xml
@@ -16,7 +16,7 @@
         <record id="pms_reservation_1" model="pms.reservation">
             <field name="partner_id" ref="main_pms_property" />
             <field name="user_id" ref="base.user_demo" />
-            <field name="reservation_type">"out"</field>
+            <field name="reservation_type">"out_service"</field>
             <field name="room_type_id" ref="pms_room_type_0" />
             <field name="checkin" eval="DateTime.today() + timedelta(-3)" />
             <field name="checkout" eval="DateTime.today() + timedelta(-1)" />
diff --git a/pms/models/pms_folio.py b/pms/models/pms_folio.py
index 1899af85..550b8050 100644
--- a/pms/models/pms_folio.py
+++ b/pms/models/pms_folio.py
@@ -282,7 +282,11 @@ class PmsFolio(models.Model):
         help="The type of the reservation. "
         "Can be 'Normal', 'Staff' or 'Out of Service'",
         default=lambda *a: "normal",
-        selection=[("normal", "Normal"), ("staff", "Staff"), ("out", "Out of Service")],
+        selection=[
+            ("normal", "Normal"),
+            ("staff", "Staff"),
+            ("out_service", "Out of Service"),
+        ],
     )
     date_order = fields.Datetime(
         string="Order Date",
@@ -795,7 +799,7 @@ def _compute_ratio_checkin_data(self):
     )
     def _compute_amount(self):
         for record in self:
-            if record.reservation_type in ("staff", "out"):
+            if record.reservation_type in ("staff", "out_service"):
                 vals = {
                     "pending_amount": 0,
                     "invoices_paid": 0,
diff --git a/pms/models/pms_reservation.py b/pms/models/pms_reservation.py
index f62d4d13..6ef305f8 100644
--- a/pms/models/pms_reservation.py
+++ b/pms/models/pms_reservation.py
@@ -573,7 +573,7 @@ class PmsReservation(models.Model):
 
     def _compute_date_order(self):
         for record in self:
-            record.date_order = datetime.datetime.today()
+            record.date_order = fields.Date.today()
 
     # TODO:
     #  consider near_to_checkin & pending_notifications to order
@@ -676,7 +676,7 @@ def _compute_allowed_room_ids(self):
     @api.depends("reservation_type", "agency_id", "folio_id")
     def _compute_partner_id(self):
         for reservation in self:
-            if reservation.reservation_type == "out":
+            if reservation.reservation_type == "out_service":
                 reservation.partner_id = reservation.pms_property_id.partner_id.id
             elif not reservation.partner_id:
                 if reservation.folio_id:
@@ -1093,7 +1093,7 @@ def _compute_shared_folio(self):
 
     def _compute_checkin_partner_count(self):
         for record in self:
-            if record.reservation_type != "out":
+            if record.reservation_type != "out_service":
                 record.checkin_partner_count = len(record.checkin_partner_ids)
                 record.checkin_partner_pending_count = record.adults - len(
                     record.checkin_partner_ids
diff --git a/pms/models/pms_room.py b/pms/models/pms_room.py
index 5511930c..4d3a8351 100644
--- a/pms/models/pms_room.py
+++ b/pms/models/pms_room.py
@@ -39,6 +39,7 @@ class PmsRoom(models.Model):
         default=lambda self: self.env.user.get_active_property_ids()[0],
         comodel_name="pms.property",
         ondelete="restrict",
+        check_pms_properties=True,
     )
     room_type_id = fields.Many2one(
         string="Property Room Type",
@@ -77,6 +78,42 @@ class PmsRoom(models.Model):
         " Order, Delivery Order and Customer Invoice/Credit Note",
         translate=True,
     )
+    occupation_status = fields.Selection(
+        string="Room Status",
+        selection=[
+            ("occupied", "Occupied"),
+            ("free", "Free"),
+            ("out_service", "Out of service"),
+        ],
+        help="Room status based on occupancy, next arrival, or out of service",
+        compute="_compute_occupation_status",
+    )
+    next_departure_reservation_id = fields.Many2one(
+        string="Currently reservation",
+        comodel_name="pms.reservation",
+        help="Reservation that currently occupies the room",
+        compute="_compute_occupation_status",
+    )
+    next_departure_datetime = fields.Datetime(
+        string="Next departure",
+        help="Expected departure from the reservation " "currently occupying the room",
+        compute="_compute_occupation_status",
+    )
+    next_arrival_reservation_id = fields.Many2one(
+        string="Next Reservation",
+        comodel_name="pms.reservation",
+        help="Next expected reservation",
+        compute="_compute_next_arrival",
+    )
+    next_arrival_datetime = fields.Datetime(
+        string="Next arrival",
+        help="Next expected arrival date",
+        compute="_compute_next_arrival",
+    )
+    color = fields.Integer(
+        string="Color Index",
+        default=1,
+    )
 
     _sql_constraints = [
         (
@@ -87,6 +124,63 @@ class PmsRoom(models.Model):
         )
     ]
 
+    def _compute_occupation_status(self):
+        for record in self:
+            # Set Status and next departure fields
+            current_reservation = (
+                self.env["pms.reservation.line"]
+                .search(
+                    [
+                        ("state", "in", ("onboard", "departure_delayed")),
+                        ("room_id", "=", record.id),
+                    ]
+                )
+                .reservation_id
+            )
+
+            record.occupation_status = "free"
+            record.next_departure_datetime = False
+            record.next_departure_reservation_id = False
+
+            if current_reservation:
+                record.occupation_status = "occupied"
+                record.next_departure_reservation_id = current_reservation
+                record.next_departure_datetime = current_reservation.checkout_datetime
+                if current_reservation.reservation_type == "out_service":
+                    record.occupation_status = "out_service"
+
+    def _compute_next_arrival(self):
+        today = fields.Date.today()
+        for record in self:
+            future_reservation_dates = (
+                self.env["pms.reservation.line"]
+                .search(
+                    [
+                        ("state", "in", ("draft", "confirm", "arrival_delayed")),
+                        ("room_id", "=", record.id),
+                        ("date", ">=", today),
+                    ]
+                )
+                .mapped("date")
+            )
+
+            record.next_arrival_reservation_id = (
+                self.env["pms.reservation.line"]
+                .search(
+                    [
+                        ("room_id", "=", record.id),
+                        ("date", "=", min(future_reservation_dates)),
+                    ]
+                )
+                .reservation_id
+            )
+
+            record.next_arrival_datetime = (
+                record.next_arrival_reservation_id.checkin_datetime
+                if record.next_arrival_reservation_id
+                else False
+            )
+
     def name_get(self):
         result = []
         for room in self:
diff --git a/pms/views/pms_folio_views.xml b/pms/views/pms_folio_views.xml
index ca945c88..8c55d40e 100644
--- a/pms/views/pms_folio_views.xml
+++ b/pms/views/pms_folio_views.xml
@@ -160,12 +160,12 @@
                         <field
                             name="partner_id"
                             placeholder="Guest"
-                            attrs="{'invisible':[('reservation_type','in',('out'))]}"
+                            attrs="{'invisible':[('reservation_type','in',('out_service'))]}"
                         />
                         <field
                             name="closure_reason_id"
                             placeholder="Closure reason"
-                            attrs="{'invisible':[('reservation_type','not in',('out'))]}"
+                            attrs="{'invisible':[('reservation_type','not in',('out_service'))]}"
                         />
                     </h1>
                     <group col="8">
diff --git a/pms/views/pms_reservation_views.xml b/pms/views/pms_reservation_views.xml
index c9599b96..57a18bf8 100644
--- a/pms/views/pms_reservation_views.xml
+++ b/pms/views/pms_reservation_views.xml
@@ -215,7 +215,7 @@
                             name="partner_id"
                             default_focus="1"
                             placeholder="Lastname, Firstname"
-                            attrs="{'invisible':[('reservation_type','in',('out'))]}"
+                            attrs="{'invisible':[('reservation_type','in',('out_service'))]}"
                             required="1"
                         />
                         <field
@@ -223,7 +223,7 @@
                             default_focus="1"
                             options="{'no_create': True,'no_open': True}"
                             placeholder="Closure Reason"
-                            attrs="{'invisible':[('reservation_type','not in',('out'))]}"
+                            attrs="{'invisible':[('reservation_type','not in',('out_service'))]}"
                         />
                     </h1>
                     <h3>
@@ -259,7 +259,7 @@
                     <field
                         name="out_service_description"
                         placeholder="Out service description"
-                        attrs="{'invisible':[('reservation_type','not in',('out'))]}"
+                        attrs="{'invisible':[('reservation_type','not in',('out_service'))]}"
                     />
                     <group col="8">
                         <group
@@ -275,7 +275,7 @@
                                 placeholder="email"
                                 widget="email"
                                 force_save="1"
-                                attrs="{'invisible': [('reservation_type','in',('out'))],
+                                attrs="{'invisible': [('reservation_type','in',('out_service'))],
                                        'readonly': [('partner_id', '!=', False),
                                                    ('partner_email','!=', False)]}"
                             />
@@ -286,7 +286,7 @@
                                 placeholder="mobile"
                                 widget="phone"
                                 force_save="1"
-                                attrs="{'invisible': [('reservation_type','in',('out'))],
+                                attrs="{'invisible': [('reservation_type','in',('out_service'))],
                                        'readonly': [('partner_id', '!=', False),
                                                    ('partner_mobile','!=', False)]}"
                             />
@@ -296,7 +296,7 @@
                                 nolabel="1"
                                 name="partner_internal_comment"
                                 string="Partner Note"
-                                attrs="{'invisible': [('reservation_type','in',('out'))]}"
+                                attrs="{'invisible': [('reservation_type','in',('out_service'))]}"
                             />
                             <field name="nights" />
                             <field placeholder="Arrival Hour" name="arrival_hour" />
@@ -323,11 +323,11 @@
                             />
                             <field
                                 name="adults"
-                                attrs="{'invisible': [('reservation_type','in',('out'))]}"
+                                attrs="{'invisible': [('reservation_type','in',('out_service'))]}"
                             />
                             <field
                                 name="children"
-                                attrs="{'invisible': [('reservation_type','in',('out'))]}"
+                                attrs="{'invisible': [('reservation_type','in',('out_service'))]}"
                             />
                             <field
                                 name="children_occupying"
@@ -340,7 +340,7 @@
                                 name="board_service_room_id"
                                 domain="[('pms_room_type_id', '=', room_type_id)]"
                                 options="{'no_create': True,'no_open': True}"
-                                attrs="{'invisible': [('reservation_type','in',('out'))]}"
+                                attrs="{'invisible': [('reservation_type','in',('out_service'))]}"
                             />
                             <field
                                 name="folio_internal_comment"
@@ -539,7 +539,7 @@
                         <page
                             name="persons"
                             string="Persons"
-                            attrs="{'invisible': [('reservation_type','in',('out'))]}"
+                            attrs="{'invisible': [('reservation_type','in',('out_service'))]}"
                         >
                             <group colspan="2" cols="6">
                                 <field
@@ -561,7 +561,7 @@
                         <page
                             name="invoicing"
                             string="Invoicing"
-                            attrs="{'invisible': [('reservation_type','in',('out'))]}"
+                            attrs="{'invisible': [('reservation_type','in',('out_service'))]}"
                         >
                         </page>
                         <page name="others" string="Others">
@@ -575,7 +575,7 @@
                                     <group>
                                         <!--<field
                                             name="channel_type"
-                                            attrs="{'required':[('reservation_type','not in',('staff','out'))]}"
+                                            attrs="{'required':[('reservation_type','not in',('staff','out_service'))]}"
                                         />-->
                                         <field name="reservation_type" />
                                     </group>
diff --git a/pms_housekeeping/__manifest__.py b/pms_housekeeping/__manifest__.py
index ca3528f2..1ff19de0 100644
--- a/pms_housekeeping/__manifest__.py
+++ b/pms_housekeeping/__manifest__.py
@@ -14,11 +14,11 @@
         "hr",
     ],
     "data": [
-        # "wizard/housekeeping_rack.xml",
-        "views/pms_room_view.xml",
-        "views/pms_reservation_view.xml",
-        "views/pms_housekeeping_task_view.xml",
-        "views/pms_housekeeping_views.xml",
+        "views/pms_housekeeping_templates.xml",
+        "views/pms_reservation_views.xml",
+        "views/pms_housekeeping_task_type_views.xml",
+        "views/pms_housekeeping_task_views.xml",
+        "views/pms_room_views.xml",
         "security/ir.model.access.csv",
         "data/cron_jobs.xml",
     ],
diff --git a/pms_housekeeping/demo/pms_housekeeping.xml b/pms_housekeeping/demo/pms_housekeeping.xml
index ea698c10..0ffc0ce5 100644
--- a/pms_housekeeping/demo/pms_housekeeping.xml
+++ b/pms_housekeeping/demo/pms_housekeeping.xml
@@ -2,63 +2,63 @@
 <odoo>
     <data noupdate="1">
         <!-- pms.housekeeping.task -->
-        <record id="pms_housekeeping_task_0" model="pms.housekeeping.task">
+        <record id="pms_housekeeping_task_0" model="pms.housekeeping.task.type">
             <field name="name">Full clean</field>
             <field name="clean_type">exit</field>
         </record>
-        <record id="pms_housekeeping_task_1" model="pms.housekeeping.task">
+        <record id="pms_housekeeping_task_1" model="pms.housekeeping.task.type">
             <field name="name">Soft clean</field>
             <field name="clean_type">occupied</field>
         </record>
-        <record id="pms_housekeeping_task_2" model="pms.housekeeping.task">
+        <record id="pms_housekeeping_task_2" model="pms.housekeeping.task.type">
             <field name="name">Review</field>
         </record>
-        <record id="pms_housekeeping_task_3" model="pms.housekeeping.task">
+        <record id="pms_housekeeping_task_3" model="pms.housekeeping.task.type">
             <field name="name">Inspect</field>
-            <field name="def_employee_id" ref="hr.employee_vad" />
+            <field name="default_employee_id" ref="hr.employee_vad" />
             <field name="clean_type">exit</field>
         </record>
-        <record id="pms_housekeeping_task_4" model="pms.housekeeping.task">
+        <record id="pms_housekeeping_task_4" model="pms.housekeeping.task.type">
             <field name="name">Inspect</field>
-            <field name="def_employee_id" ref="hr.employee_vad" />
+            <field name="default_employee_id" ref="hr.employee_vad" />
             <field name="clean_type">occupied</field>
         </record>
         <!-- pms.housekeeping -->
-        <record id="pms_housekeeping_0" model="pms.housekeeping">
+        <record id="pms_housekeeping_0" model="pms.housekeeping.task">
             <field name="room_id" ref="pms.pms_room_4" />
             <field name="employee_id" ref="hr.employee_jep" />
-            <field name="task_id" ref="pms_housekeeping.pms_housekeeping_task_0" />
+            <field name="task_type_id" ref="pms_housekeeping.pms_housekeeping_task_0" />
             <field name="state">to_do</field>
         </record>
-        <record id="pms_housekeeping_1" model="pms.housekeeping">
+        <record id="pms_housekeeping_1" model="pms.housekeeping.task">
             <field name="room_id" ref="pms.pms_room_3" />
             <field name="employee_id" ref="hr.employee_jep" />
-            <field name="task_id" ref="pms_housekeeping.pms_housekeeping_task_0" />
+            <field name="task_type_id" ref="pms_housekeeping.pms_housekeeping_task_0" />
             <field name="state">to_do</field>
         </record>
-        <record id="pms_housekeeping_2" model="pms.housekeeping">
+        <record id="pms_housekeeping_2" model="pms.housekeeping.task">
             <field name="room_id" ref="pms.pms_room_1" />
             <field name="employee_id" ref="hr.employee_jep" />
-            <field name="task_id" ref="pms_housekeeping.pms_housekeeping_task_1" />
+            <field name="task_type_id" ref="pms_housekeeping.pms_housekeeping_task_1" />
             <field name="state">draft</field>
         </record>
-        <record id="pms_housekeeping_3" model="pms.housekeeping">
+        <record id="pms_housekeeping_3" model="pms.housekeeping.task">
             <field name="room_id" ref="pms.pms_room_4" />
             <field name="employee_id" ref="hr.employee_vad" />
-            <field name="task_id" ref="pms_housekeeping.pms_housekeeping_task_3" />
+            <field name="task_type_id" ref="pms_housekeeping.pms_housekeeping_task_3" />
             <field name="state">draft</field>
         </record>
-        <record id="pms_housekeeping_4" model="pms.housekeeping">
+        <record id="pms_housekeeping_4" model="pms.housekeeping.task">
             <field name="notes">Need clean it again</field>
             <field name="room_id" ref="pms.pms_room_2" />
             <field name="employee_id" ref="hr.employee_mit" />
-            <field name="task_id" ref="pms_housekeeping.pms_housekeeping_task_2" />
+            <field name="task_type_id" ref="pms_housekeeping.pms_housekeeping_task_2" />
             <field name="state">to_do</field>
         </record>
-        <record id="pms_housekeeping_5" model="pms.housekeeping">
+        <record id="pms_housekeeping_5" model="pms.housekeeping.task">
             <field name="room_id" ref="pms.pms_room_3" />
             <field name="employee_id" ref="hr.employee_jog" />
-            <field name="task_id" ref="pms_housekeeping.pms_housekeeping_task_1" />
+            <field name="task_type_id" ref="pms_housekeeping.pms_housekeeping_task_1" />
             <field name="state">draft</field>
         </record>
     </data>
diff --git a/pms_housekeeping/models/__init__.py b/pms_housekeeping/models/__init__.py
index 4ec8da67..b2c15eb6 100644
--- a/pms_housekeeping/models/__init__.py
+++ b/pms_housekeeping/models/__init__.py
@@ -1,7 +1,7 @@
 # Copyright 2021  Jose Luis Algara
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
+from . import pms_housekeeping_task_type
 from . import pms_housekeeping_task
-from . import pms_housekeeping
 from . import pms_reservation
 from . import pms_room
diff --git a/pms_housekeeping/models/pms_housekeeping.py b/pms_housekeeping/models/pms_housekeeping.py
deleted file mode 100644
index f97a935d..00000000
--- a/pms_housekeeping/models/pms_housekeeping.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2020 Jose Luis Algara (Alda Hotels <https://www.aldahotels.es>)
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import fields, models
-
-
-class HouseKeeping(models.Model):
-    _name = "pms.housekeeping"
-    _description = "HouseKeeping"
-    # HouseKeeping 'log'
-
-    # Fields declaration
-
-    task_date = fields.Date(
-        string="Clean date", default=lambda self: fields.Datetime.now(), required=True
-    )
-    task_start = fields.Datetime(string="Task start at")
-    task_end = fields.Datetime(string="Task end at")
-    room_id = fields.Many2one("pms.room", string="Room")
-    employee_id = fields.Many2one("hr.employee", string="Employee")
-    task_id = fields.Many2one("pms.housekeeping.task", string="Task", required=True)
-    notes = fields.Text("Internal Notes")
-    lostfound = fields.Text("Lost and Found")
-    state = fields.Selection(
-        string="Task State",
-        selection=[
-            ("draft", "Draft"),
-            ("to_do", "To Do"),
-            ("in_progress", "In Progress"),
-            ("done", "Done"),
-        ],
-        default="draft",
-    )
-    color = fields.Integer("Color Index")
-
-    # Default Methods ang Gets
-    def name_get(self):
-        result = []
-        for task in self:
-            name = task.task_id.name
-            result.append((task.id, name))
-        return result
diff --git a/pms_housekeeping/models/pms_housekeeping_task.py b/pms_housekeeping/models/pms_housekeeping_task.py
index d3e09ceb..5164b6ea 100644
--- a/pms_housekeeping/models/pms_housekeeping_task.py
+++ b/pms_housekeeping/models/pms_housekeeping_task.py
@@ -4,39 +4,49 @@
 from odoo import fields, models
 
 
-class HouseKeepingTask(models.Model):
+class PmsHouseKeepingTask(models.Model):
     _name = "pms.housekeeping.task"
-    _description = "HouseKeeping Tasks"
-    # HouseKeeping 'Task types'
+    _description = "HouseKeeping Task"
 
-    # Fields declaration
-    active = fields.Boolean("Active", default=True)
-    name = fields.Char("Task Name", translate=True, required=True)
-    pms_property_ids = fields.Many2many(
-        string="Properties",
-        help="Properties with access to the element;"
-        " if not set, all properties can access",
-        required=False,
-        comodel_name="pms.property",
-        relation="pms_housekeepink_task_pms_property_rel",
-        column1="pms_housekeepink_task_id",
-        column2="pms_property_id",
-        ondelete="restrict",
-        check_pms_properties=True,
+    task_date = fields.Date(
+        string="Clean date",
+        help="Date the task was done or;" " is scheduled to be done",
+        default=lambda self: fields.Datetime.now(),
+        required=True,
     )
-
-    clean_type = fields.Selection(
-        string="Clean type",
+    task_start = fields.Datetime(string="Task start at")
+    task_end = fields.Datetime(string="Task end at")
+    room_id = fields.Many2one(
+        comodel_name="pms.room",
+        string="Room",
+    )
+    employee_id = fields.Many2one(
+        string="Employee",
+        comodel_name="hr.employee",
+    )
+    task_type_id = fields.Many2one(
+        string="Task",
+        comodel_name="pms.housekeeping.task.type",
+        required=True,
+    )
+    notes = fields.Text(string="Internal Notes")
+    lostfound = fields.Text(string="Lost and Found")
+    state = fields.Selection(
+        string="Task State",
         selection=[
-            ("occupied", "Occupied"),
-            ("exit", "Exit"),
-            ("picked_up", "Picked up"),
-            ("staff", "Staff"),
-            ("clean", "Clean"),
-            ("inspected", "Inspected"),
-            ("dont_disturb", "Don't disturb"),
+            ("draft", "Draft"),
+            ("to_do", "To Do"),
+            ("in_progress", "In Progress"),
+            ("done", "Done"),
         ],
+        default="draft",
     )
-    def_employee_id = fields.Many2one(
-        "hr.employee", string="Employee assigned by default"
-    )
+    color = fields.Integer(string="Color Index")
+
+    # Default Methods ang Gets
+    def name_get(self):
+        result = []
+        for task in self:
+            name = task.task_type_id.name
+            result.append((task.id, name))
+        return result
diff --git a/pms_housekeeping/models/pms_housekeeping_task_type.py b/pms_housekeeping/models/pms_housekeeping_task_type.py
new file mode 100644
index 00000000..080ea66a
--- /dev/null
+++ b/pms_housekeeping/models/pms_housekeeping_task_type.py
@@ -0,0 +1,42 @@
+# Copyright 2020 Jose Luis Algara (Alda Hotels <https://www.aldahotels.es>)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class PmsHouseKeepingTaskType(models.Model):
+    _name = "pms.housekeeping.task.type"
+    _description = "HouseKeeping Task Types"
+
+    active = fields.Boolean(string="Active", default=True)
+    name = fields.Char(string="Task Name", translate=True, required=True)
+    pms_property_ids = fields.Many2many(
+        string="Properties",
+        help="Properties with access to the element;"
+        " if not set, all properties can access",
+        required=False,
+        comodel_name="pms.property",
+        relation="pms_housekeepink_task_pms_property_rel",
+        column1="pms_housekeepink_task_id",
+        column2="pms_property_id",
+        ondelete="restrict",
+        check_pms_properties=True,
+    )
+
+    clean_type = fields.Selection(
+        string="Clean type",
+        selection=[
+            ("occupied", "Occupied"),
+            ("exit", "Exit"),
+            ("picked_up", "Picked up"),
+            ("staff", "Staff"),
+            ("clean", "Clean"),
+            ("inspected", "Inspected"),
+            ("dont_disturb", "Don't disturb"),
+        ],
+    )
+    default_employee_id = fields.Many2one(
+        string="Default House Keeper",
+        help="Employee assigned by default",
+        comodel_name="hr.employee",
+    )
diff --git a/pms_housekeeping/models/pms_reservation.py b/pms_housekeeping/models/pms_reservation.py
index 10cd0546..624c2677 100644
--- a/pms_housekeeping/models/pms_reservation.py
+++ b/pms_housekeeping/models/pms_reservation.py
@@ -11,3 +11,14 @@ class PmsRoom(models.Model):
         string="Dont disturb",
         default=False,
     )
+
+    # def action_reservation_checkout(self):
+    #     for record in self:
+    #         if not record.allowed_checkout:
+    #             raise UserError(_("This reservation cannot be check out"))
+    #         record.state = "done"
+    #         if record.checkin_partner_ids:
+    #             record.checkin_partner_ids.filtered(
+    #                 lambda check: check.state == "onboard"
+    #             ).action_done()
+    #     return True
diff --git a/pms_housekeeping/models/pms_room.py b/pms_housekeeping/models/pms_room.py
index 17a31b69..11deeea8 100644
--- a/pms_housekeeping/models/pms_room.py
+++ b/pms_housekeeping/models/pms_room.py
@@ -25,9 +25,9 @@ def kanban_card_color(state):
 class PmsRoom(models.Model):
     _inherit = "pms.room"
 
-    housekeeping_ids = fields.One2many(
+    housekeeping_task_ids = fields.One2many(
         string="Housekeeping tasks",
-        comodel_name="pms.housekeeping",
+        comodel_name="pms.housekeeping.task",
         inverse_name="room_id",
         domain=[("task_date", "=", datetime.now().date())],
     )
@@ -84,7 +84,7 @@ def get_clean_status(self, date_clean=False, margin_days=5):
             lambda reservation: reservation.date < date_clean
         )
 
-        if today_res.reservation_id.reservation_type == "out":
+        if today_res.reservation_id.reservation_type == "out_service":
             status = "dont_disturb"
             return status
         if len(today_res) == 0:
@@ -117,8 +117,8 @@ def add_today_tasks(self):
             for task in tasks:
                 new_task = self.env["pms.housekeeping"]
                 employee = (
-                    task.def_employee_id.id
-                    if len(task.def_employee_id) > 0
+                    task.default_employee_id.id
+                    if len(task.default_employee_id) > 0
                     else room.clean_employee_id.id
                 )
                 new_task.create(
diff --git a/pms_housekeeping/security/ir.model.access.csv b/pms_housekeeping/security/ir.model.access.csv
index 5c5e86ea..4e0c0c4f 100644
--- a/pms_housekeeping/security/ir.model.access.csv
+++ b/pms_housekeeping/security/ir.model.access.csv
@@ -1,3 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-user_access_pms_housekeeping,user_access_pms_housekeeping,model_pms_housekeeping,pms.group_pms_user,1,1,1,1
 user_access_pms_housekeeping_task,user_access_pms_housekeeping_task,model_pms_housekeeping_task,pms.group_pms_user,1,1,1,1
+user_access_pms_housekeeping_task_type,user_access_pms_housekeeping_task_type,model_pms_housekeeping_task_type,pms.group_pms_user,1,1,1,1
diff --git a/pms_housekeeping/static/src/scss/pms_room_rack.scss b/pms_housekeeping/static/src/scss/pms_room_rack.scss
new file mode 100644
index 00000000..1b970b1c
--- /dev/null
+++ b/pms_housekeeping/static/src/scss/pms_room_rack.scss
@@ -0,0 +1,122 @@
+.o_kanban_view.o_kanban_dashboard {
+    &.o_room_rack_kanban {
+        &.o_kanban_ungrouped .o_kanban_record {
+            width: 350px;
+            &:not(.o_kanban_ghost) {
+                height: 180px;
+            }
+        }
+
+        .ribbon_free {
+            &::before,
+            &::after {
+                display: none;
+            }
+
+            span {
+                background-color: #7bad83 !important;
+            }
+        }
+        .ribbon_out_service {
+            &::before,
+            &::after {
+                display: none;
+            }
+
+            span {
+                background-color: #792f36 !important;
+            }
+        }
+        .ribbon {
+            &::before,
+            &::after {
+                display: none;
+            }
+
+            span {
+                background-color: $o-brand-odoo;
+                padding: 5px;
+                font-size: small;
+                z-index: unset;
+                height: auto;
+            }
+        }
+        .ribbon-top-right {
+            margin-top: -$o-kanban-dashboard-vpadding;
+
+            span {
+                left: 0px;
+                right: 30px;
+            }
+        }
+    }
+
+    .o_kanban_record_subtitle {
+        height: 1em;
+    }
+
+    .o_room_rack_kanban_boxes {
+        display: flex;
+        flex-flow: row nowrap;
+
+        .o_room_rack_kanban_box {
+            position: relative;
+            padding: 0 0 0 0;
+            flex: 1 1 auto;
+            display: flex;
+            flex-flow: row nowrap;
+            justify-content: center;
+
+            &:first-child {
+                justify-content: flex-start;
+                padding-left: 16px;
+            }
+            div:last-child {
+                justify-content: flex-end;
+                text-align: right;
+            }
+            .o_link_trackers {
+                .fa {
+                    color: $o-brand-primary;
+                }
+            }
+            .o_value {
+                font-weight: 800;
+            }
+
+            > a {
+                font-weight: 500;
+
+                &.o_needaction {
+                    font-size: small;
+                    font-weight: 400;
+                    margin-left: 4px;
+                    @include o-hover-opacity(0.5, 1);
+
+                    &:before {
+                        content: "/ ";
+                    }
+
+                    &:after {
+                        content: "\f086";
+                        font: normal normal normal 14px/1 FontAwesome;
+                    }
+                }
+            }
+        }
+    }
+}
+
+.o_kanban_view .oe_kanban_card {
+    .o_kanban_state_with_padding {
+        padding-left: 7%;
+        padding-bottom: 5%;
+        width: 12px;
+    }
+}
+
+.o_recruitment_list {
+    .o_list_button {
+        text-align: right;
+    }
+}
diff --git a/pms_housekeeping/views/pms_housekeeping_task_type_views.xml b/pms_housekeeping/views/pms_housekeeping_task_type_views.xml
new file mode 100644
index 00000000..a5b821d0
--- /dev/null
+++ b/pms_housekeeping/views/pms_housekeeping_task_type_views.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+
+    <record id="pms_housekeeping_task_type_view_tree" model="ir.ui.view">
+        <field name="name">pms.housekeeping.task.type.view.tree</field>
+        <field name="model">pms.housekeeping.task.type</field>
+        <field name="type">tree</field>
+        <field name="priority" eval="16" />
+        <field name="arch" type="xml">
+            <tree string="Housekeeping Task Types">
+                <field name="name" colspan="1" />
+                <field name="clean_type" colspan="1" />
+            </tree>
+        </field>
+    </record>
+
+    <record
+        model="ir.actions.act_window"
+        id="action_pms_house_keeping_task_type_view_form"
+    >
+        <field name="name">Housekeeping Task Types</field>
+        <field name="res_model">pms.housekeeping.task.type</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+
+    <menuitem
+        name="House Keeping Task Types"
+        id="menu_action_pms_house_keeping_task_type_view_form"
+        action="action_pms_house_keeping_task_type_view_form"
+        sequence="90"
+        parent="pms.pms_configuration_menu"
+    />
+</odoo>
diff --git a/pms_housekeeping/views/pms_housekeeping_task_view.xml b/pms_housekeeping/views/pms_housekeeping_task_view.xml
deleted file mode 100644
index 5727605f..00000000
--- a/pms_housekeeping/views/pms_housekeeping_task_view.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-
-<record id="view_pms_housekeeping_tasks_tree" model="ir.ui.view">
-    <field name="name">Housekeeping Tasks view</field>
-    <field name="model">pms.housekeeping.task</field>
-    <field name="type">tree</field>
-    <field name="mode">primary</field>
-    <field name="priority" eval="16" />
-    <field name="active" eval="True" />
-    <field name="arch" type="xml">
-        <tree string=" Property Ubications">
-            <field name="active" colspan="1" />
-            <field name="name" colspan="1" />
-            <field name="clean_type" colspan="1" />
-        </tree>
-    </field>
-</record>
-
-<record model="ir.actions.act_window" id="action_pms_house_keeping_tasks_view_form">
-    <field name="name">Housekeeping Tasks</field>
-    <field name="res_model">pms.housekeeping.task</field>
-    <field name="view_mode">tree,form</field>
-</record>
-
-
-<menuitem
-        name="House Keeping Tasks"
-        id="menu_action_pms_house_keeping_tasks_view_form"
-        action="action_pms_house_keeping_tasks_view_form"
-        sequence="90"
-        parent="pms.pms_configuration_menu"
-    />
-</odoo>
diff --git a/pms_housekeeping/views/pms_housekeeping_views.xml b/pms_housekeeping/views/pms_housekeeping_task_views.xml
similarity index 83%
rename from pms_housekeeping/views/pms_housekeeping_views.xml
rename to pms_housekeeping/views/pms_housekeeping_task_views.xml
index 10053de7..3694fca3 100644
--- a/pms_housekeeping/views/pms_housekeeping_views.xml
+++ b/pms_housekeeping/views/pms_housekeeping_task_views.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <record id="view_pms_housekeeping_tree" model="ir.ui.view">
-        <field name="name">Housekeeping tree view</field>
-        <field name="model">pms.housekeeping</field>
+    <record id="pms_housekeeping_task_view_tree" model="ir.ui.view">
+        <field name="name">pms.housekeeping.task.view.tree</field>
+        <field name="model">pms.housekeeping.task</field>
         <field name="type">tree</field>
-        <field name="mode">primary</field>
         <field name="priority" eval="16" />
         <field name="active" eval="True" />
         <field name="arch" type="xml">
@@ -13,7 +12,7 @@
                 <field name="state" colspan="1" />
                 <field name="room_id" colspan="1" />
                 <field name="employee_id" colspan="1" />
-                <field name="task_id" colspan="1" />
+                <field name="task_type_id" colspan="1" />
                 <field name="task_start" />
                 <field name="task_end" />
                 <field name="notes" colspan="1" />
@@ -22,16 +21,16 @@
         </field>
     </record>
 
-    <record id="view_pms_housekeeping_form" model="ir.ui.view">
-        <field name="name">Housekeeping form view</field>
-        <field name="model">pms.housekeeping</field>
+    <record id="pms_housekeeping_task_view_form" model="ir.ui.view">
+        <field name="name">pms.housekeeping.task.view.form</field>
+        <field name="model">pms.housekeeping.task</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Housekeeping">
                 <sheet>
                     <group>
                         <group col="2" colspan="2">
-                            <field name="task_id" />
+                            <field name="task_type_id" />
                         </group>
                         <group col="4" colspan="2">
                             <field name="task_date" />
@@ -54,11 +53,10 @@
         </field>
     </record>
 
-    <record id="view_pms_housekeeping_rack_kanban" model="ir.ui.view">
-        <field name="name">Housekeeping today tasks kanban view</field>
-        <field name="model">pms.housekeeping</field>
+    <record id="pms_housekeeping_rack_task_view_kanban" model="ir.ui.view">
+        <field name="name">pms.housekeeping.rack.task.view.kanban</field>
+        <field name="model">pms.housekeeping.task</field>
         <field name="type">kanban</field>
-        <field name="mode">primary</field>
         <field name="priority" eval="16" />
         <field name="active" eval="True" />
         <field name="arch" type="xml">
@@ -115,7 +113,7 @@
                                 <!-- Content elements and fields go here... -->
 
                                 <div style="font-size: 1.5em;">
-                                    <field name="task_id" />
+                                    <field name="task_type_id" />
                                 </div>
                                 <div style="font-size: 1.1em;">
                                     <field name="room_id" />
@@ -167,13 +165,14 @@
         </field>
     </record>
 
-    <record id="view_filter_housekeeping_rack" model="ir.ui.view">
-        <field name="model">pms.housekeeping</field>
+    <record id="pms_housekeeping_rack_task_view_search" model="ir.ui.view">
+        <field name="name">pms.housekeeping.rack.task.view.search</field>
+        <field name="model">pms.housekeeping.task</field>
         <field name="arch" type="xml">
             <search string="Housekeeping filters">
                 <field name="employee_id" />
                 <!--                <field name="room_id.floor_id" />-->
-                <field name="task_id" />
+                <field name="task_type_id" />
                 <!-- <filter name="filter_occupied" string="Occupied" domain="[('clean_status','=','occupied')]"/> -->
 
                 <searchpanel>
@@ -185,7 +184,7 @@
                     <!--                        icon="fa-hospital-o"-->
                     <!--                    />-->
                     <field
-                        name="task_id"
+                        name="task_type_id"
                         string="Task type"
                         enable_counters="1"
                         select="multi"
@@ -212,15 +211,15 @@
     </record>
 
 
-    <record model="ir.actions.act_window" id="action_pms_house_keeping_view_form">
-        <field name="name">Housekeeping</field>
-        <field name="res_model">pms.housekeeping</field>
+    <record model="ir.actions.act_window" id="pms_housekeeping_task_action">
+        <field name="name">Housekeeping Tasks</field>
+        <field name="res_model">pms.housekeeping.task</field>
         <field name="view_mode">tree,form</field>
     </record>
 
-    <record model="ir.actions.act_window" id="action_pms_house_keeping_view_today_form">
-        <field name="name">Housekeeping</field>
-        <field name="res_model">pms.housekeeping</field>
+    <record model="ir.actions.act_window" id="pms_housekeeping_action_today">
+        <field name="name">HouseKeeping Tasks</field>
+        <field name="res_model">pms.housekeeping.task</field>
         <field name="domain">[('task_date', '=',(context_today().strftime('%Y-%m-%d')))]
         </field>
         <field name="view_mode">kanban,tree,form</field>
@@ -232,24 +231,17 @@
         sequence="17"
         parent="pms.pms_management_menu"
     />
-    <menuitem
-        name="Room Rack"
-        id="menu_action_pms_house_keeping_view_rack"
-        action="pms_housekeeping.action_pms_room_rack_kanban"
-        sequence="10"
-        parent="pms_housekeeping.menu_action_pms_house_keeping"
-    />
     <menuitem
         name="Today Tasks"
-        id="menu_action_pms_house_keeping_view_today_form"
-        action="action_pms_house_keeping_view_today_form"
+        id="menu_pms_housekeeping_today"
+        action="pms_housekeeping_action_today"
         sequence="20"
         parent="pms_housekeeping.menu_action_pms_house_keeping"
     />
     <menuitem
         name="Tasks History"
-        id="menu_action_pms_house_keeping_view_form"
-        action="action_pms_house_keeping_view_form"
+        id="menu_pms_housekeeping_task"
+        action="pms_housekeeping_task_action"
         sequence="30"
         parent="pms_housekeeping.menu_action_pms_house_keeping"
     />
diff --git a/pms_housekeeping/views/pms_housekeeping_templates.xml b/pms_housekeeping/views/pms_housekeeping_templates.xml
new file mode 100644
index 00000000..de47a191
--- /dev/null
+++ b/pms_housekeeping/views/pms_housekeeping_templates.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+        <template
+            id="assets_backend"
+            name="hr_housekeeping assets"
+            inherit_id="web.assets_backend"
+        >
+            <xpath expr="." position="inside">
+                <link
+                    rel="stylesheet"
+                    type="text/scss"
+                    href="/pms_housekeeping/static/src/scss/pms_room_rack.scss"
+                />
+            </xpath>
+        </template>
+    </data>
+</odoo>
diff --git a/pms_housekeeping/views/pms_reservation_view.xml b/pms_housekeeping/views/pms_reservation_views.xml
similarity index 76%
rename from pms_housekeeping/views/pms_reservation_view.xml
rename to pms_housekeeping/views/pms_reservation_views.xml
index 79131a42..394c3e3c 100644
--- a/pms_housekeeping/views/pms_reservation_view.xml
+++ b/pms_housekeeping/views/pms_reservation_views.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
-    <record id="inheit_pms_reservation_view_form" model="ir.ui.view">
-        <field name="name">view.model.form</field>
+    <record id="pms_reservation_view_form" model="ir.ui.view">
+        <field name="name">pms.reservation.view.form</field>
         <field name="model">pms.reservation</field>
         <field name="inherit_id" ref="pms.pms_reservation_view_form" />
         <field name="arch" type="xml">
diff --git a/pms_housekeeping/views/pms_room_view.xml b/pms_housekeeping/views/pms_room_view.xml
deleted file mode 100644
index 7468463b..00000000
--- a/pms_housekeeping/views/pms_room_view.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-
-    <record id="inherit_pms_room_view_form" model="ir.ui.view">
-        <field name="name">view.model.form</field>
-        <field name="model">pms.room</field>
-        <field name="inherit_id" ref="pms.pms_room_view_form" />
-        <field name="arch" type="xml">
-            <xpath expr="//page[@name='information_pms_room']" position="inside">
-                <group colspan="4" col="4">
-                    <field name="clean_status" string="Clean Status" />
-                    <!-- <field name="clean_type" string="Clean Type" attrs="{'readonly': True}" /> -->
-                </group>
-            </xpath>
-        </field>
-    </record>
-
-    <record id="view_pms_room_rack_form" model="ir.ui.view">
-        <field name="name">Room rack form view</field>
-        <field name="model">pms.room</field>
-        <field name="type">form</field>
-        <field name="priority" eval="40" />
-        <field name="active" eval="True" />
-        <field name="arch" type="xml">
-            <form string="Property Room">
-                <group col="4" colspan="4" name="header">
-                    <field
-                        name="name"
-                        readonly="1"
-                        nolabel="1"
-                        style="font-size: 2em;"
-                    />
-                    <group col="1">
-                        <field name="clean_employee_id" />
-                    </group>
-                    <group col="1">
-                        <field
-                            name="employee_picture"
-                            widget="image"
-                            class="oe_left oe_avatar"
-                            nolabel="1"
-                            readonly="1"
-                        />
-                    </group>
-                </group>
-                <group col="4" colspan="4" name="status" string="Clean type and status">
-                    <field
-                        name="clean_status"
-                        readonly="1"
-                        nolabel="1"
-                        style="font-size: 2em;"
-                    />
-                    <!-- <group col="1">
-                        <field name="clean_status" />
-                    </group> -->
-                </group>
-
-                <separator string="Task Lines" colspan="4" />
-
-                <field
-                    name="housekeeping_ids"
-                    readonly="0"
-                    context="{'default_state': 'to_do',
-                              'default_employee_id': clean_employee_id,
-                              'tree_view_ref':'view_pms_room_rack_tree',
-                              'form_view_ref':'view_pms_room_rack_form',
-                              'default_room_id': id}"
-                />
-
-            </form>
-        </field>
-    </record>
-
-    <record id="view_pms_room_rack_tree" model="ir.ui.view">
-        <field name="name">Room rack tree view</field>
-        <field name="model">pms.room</field>
-        <field name="type">tree</field>
-        <field name="priority" eval="20" />
-        <field name="active" eval="True" />
-        <field name="arch" type="xml">
-            <tree string="Property Room">
-                <field name="sequence" widget="handle" />
-                <field name="name" />
-                <field name="capacity" />
-                <field name="clean_status" />
-                <field name="clean_employee_id" />
-            </tree>
-        </field>
-    </record>
-
-    <record id="view_filter_room_rack" model="ir.ui.view">
-        <field name="model">pms.room</field>
-        <field name="arch" type="xml">
-            <search string="Housekeeping filters">
-                <field name="clean_employee_id" />
-                <field name="ubication_id" />
-                <field name="room_type_id" />
-                <!-- <filter name="filter_occupied" string="Occupied" domain="[('clean_status','=','occupied')]"/> -->
-
-                <searchpanel>
-                    <field
-                        name="room_type_id"
-                        string="Room type"
-                        enable_counters="1"
-                        select="multi"
-                        icon="fa-bed"
-                    />
-                    <field
-                        name="clean_employee_id"
-                        string="Employee"
-                        enable_counters="1"
-                        select="multi"
-                        icon="fa-user"
-                    />
-                    <field
-                        name="ubication_id"
-                        string="Ubication"
-                        enable_counters="1"
-                        select="multi"
-                        icon="fa-hospital-o"
-                    />
-                    <!-- <field name="clean_status" string="Clean Type" enable_counters="1" select="multi"/> -->
-                </searchpanel>
-            </search>
-        </field>
-    </record>
-
-    <record id="view_pms_room_rack_kanban" model="ir.ui.view">
-        <field name="name">Room rack kanban view</field>
-        <field name="model">pms.room</field>
-        <field name="type">kanban</field>
-        <field name="mode">primary</field>
-        <field name="priority" eval="16" />
-        <field name="active" eval="True" />
-        <field name="arch" type="xml">
-            <kanban
-                default_group_by="ubication_id"
-                default_order="ubication_id"
-                class="o_res_partner_kanban"
-                sample="1"
-                group_create="false"
-                create="false"
-            >
-                <field name="name" />
-                <templates>
-                    <t t-name="kanban-box">
-                        <div t-attf-class="oe_kanban_global_click_edit">
-                            <div class="o_dropdown_kanban dropdown">
-                                <!-- Top-right drop down menu here... -->
-                            </div>
-                            <div class="oe_kanban_body">
-                                <!-- Content elements and fields go here... -->
-                                <div style="font-size: 1.5em;">
-                                    <field name="name" />
-                                       <!-- class="oe_stat_button" -->
-                                </div><div style="font-size: 1.1em;">
-                                    <field name="clean_status" />
-                                </div>
-
-                            </div>
-
-
-                            <div class="oe_kanban_footer">
-                                <div class="oe_kanban_footer_left">
-                                    <!-- Left hand footer... -->
-                                    <field
-                                        name="housekeeping_ids"
-                                        widget="many2many_tags"
-                                        domain="[('state', '=', 'draft')]"
-                                    />
-                                    Default: <field name="clean_employee_id" />
-                                    <div>
-                                        <!-- <field name="clean_type" /> -->
-                                    </div>
-                                </div>
-                                <div class="oe_kanban_footer_right">
-                                    <!-- Right hand footer... -->
-                                    <a
-                                        type="object"
-                                        name="add_today_tasks"
-                                        help="Add the housekeeping tasks"
-                                    >
-                                        <span
-                                            class="fa fa-plus-square"
-                                            title="Add all today tasks"
-                                        />
-                                    </a>
-                                </div>
-                            </div>
-                            <div class="oe_clear" />
-                            <div>
-                            </div>
-                        </div>
-                    </t>
-                </templates>
-            </kanban>
-        </field>
-    </record>
-    <record model="ir.actions.act_window" id="action_pms_room_rack_kanban">
-        <field name="name">Housekeeping</field>
-        <field name="res_model">pms.room</field>
-        <field name="view_mode">kanban,tree,form</field>
-        <field
-            name="view_ids"
-            eval="[(5, 0, 0),
-        (0, 0, {'view_mode': 'kanban', 'view_id': ref('view_pms_room_rack_kanban')}),
-        (0, 0, {'view_mode': 'tree', 'view_id': ref('view_pms_room_rack_tree')}),
-        (0, 0, {'view_mode': 'form', 'view_id': ref('view_pms_room_rack_form')})]"
-        />
-    </record>
-
-</odoo>
diff --git a/pms_housekeeping/views/pms_room_views.xml b/pms_housekeeping/views/pms_room_views.xml
new file mode 100644
index 00000000..1ce7a35a
--- /dev/null
+++ b/pms_housekeeping/views/pms_room_views.xml
@@ -0,0 +1,256 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+
+    <record id="pms_room_view_form" model="ir.ui.view">
+        <field name="name">pms.room.view.form</field>
+        <field name="model">pms.room</field>
+        <field name="inherit_id" ref="pms.pms_room_view_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//page[@name='information_pms_room']" position="inside">
+                <group colspan="4" col="4">
+                    <field name="clean_status" string="Clean Status" />
+                    <!-- <field name="clean_type" string="Clean Type" attrs="{'readonly': True}" /> -->
+                </group>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="pms_room_rack_view_form" model="ir.ui.view">
+        <field name="name">pms.room.rack.view.form</field>
+        <field name="model">pms.room</field>
+        <field name="type">form</field>
+        <field name="priority" eval="40" />
+        <field name="active" eval="True" />
+        <field name="arch" type="xml">
+            <form string="Property Room">
+                <group col="4" colspan="4" name="header">
+                    <field
+                        name="name"
+                        readonly="1"
+                        nolabel="1"
+                        style="font-size: 2em;"
+                    />
+                    <group col="1">
+                        <field name="clean_employee_id" />
+                    </group>
+                    <group col="1">
+                        <field
+                            name="employee_picture"
+                            widget="image"
+                            class="oe_left oe_avatar"
+                            nolabel="1"
+                            readonly="1"
+                        />
+                    </group>
+                </group>
+                <group col="4" colspan="4" name="status" string="Clean type and status">
+                    <field
+                        name="clean_status"
+                        readonly="1"
+                        nolabel="1"
+                        style="font-size: 2em;"
+                    />
+                    <!-- <group col="1">
+                        <field name="clean_status" />
+                    </group> -->
+                </group>
+
+                <separator string="Task Lines" colspan="4" />
+
+                <field
+                    name="housekeeping_task_ids"
+                    readonly="0"
+                    context="{'default_state': 'to_do',
+                              'default_employee_id': clean_employee_id,
+                              'tree_view_ref':'view_pms_room_rack_tree',
+                              'form_view_ref':'view_pms_room_rack_form',
+                              'default_room_id': id}"
+                />
+
+            </form>
+        </field>
+    </record>
+
+    <record id="pms_room_rack_view_tree" model="ir.ui.view">
+        <field name="name">pms.room.rack.view.tree</field>
+        <field name="model">pms.room</field>
+        <field name="type">tree</field>
+        <field name="priority" eval="20" />
+        <field name="active" eval="True" />
+        <field name="arch" type="xml">
+            <tree string="Property Room">
+                <field name="sequence" widget="handle" />
+                <field name="next_arrival_datetime" widget="remaining_days" />
+                <field name="name" />
+                <field name="capacity" />
+                <field name="occupation_status" />
+                <field name="next_departure_reservation_id" string="In House" />
+                <field name="next_departure_datetime" widget="remaining_days" />
+                <field name="next_arrival_reservation_id" string="Next arrival" />
+            </tree>
+        </field>
+    </record>
+
+    <record id="room_rack_view_search" model="ir.ui.view">
+        <field name="name">room.rack.view.search</field>
+        <field name="model">pms.room</field>
+        <field name="arch" type="xml">
+            <search string="Housekeeping filters">
+                <field name="clean_employee_id" />
+                <field name="ubication_id" />
+                <field name="room_type_id" />
+                <!-- <filter name="filter_occupied" string="Occupied" domain="[('clean_status','=','occupied')]"/> -->
+
+                <searchpanel>
+                    <field
+                        name="room_type_id"
+                        string="Room type"
+                        enable_counters="1"
+                        select="multi"
+                        icon="fa-bed"
+                    />
+                    <field
+                        name="clean_employee_id"
+                        string="Employee"
+                        enable_counters="1"
+                        select="multi"
+                        icon="fa-user"
+                    />
+                    <field
+                        name="ubication_id"
+                        string="Ubication"
+                        enable_counters="1"
+                        select="multi"
+                        icon="fa-hospital-o"
+                    />
+                    <!-- <field name="clean_status" string="Clean Type" enable_counters="1" select="multi"/> -->
+                </searchpanel>
+            </search>
+        </field>
+    </record>
+
+    <record id="pms_room_rack_view_kanban" model="ir.ui.view">
+        <field name="name">pms.room.rack.view.kanban</field>
+        <field name="model">pms.room</field>
+        <field name="type">kanban</field>
+        <field name="priority" eval="16" />
+        <field name="active" eval="True" />
+        <field name="arch" type="xml">
+            <kanban
+                sample="1"
+                default_group_by="ubication_id"
+                group_create="false"
+                create="false"
+                class="oe_background_grey o_kanban_dashboard o_room_rack_kanban"
+            >
+                <field name="name" />
+                <field name="room_type_id" />
+                <field name="next_arrival_datetime" />
+                <field name="next_departure_datetime" />
+                <field name="next_departure_reservation_id" />
+                <field name="pms_property_id" />
+                <field name="occupation_status" />
+                <field name="color" />
+
+                <templates>
+                    <t t-name="kanban-box">
+                        <div
+                            t-attf-class="#{!selection_mode ? kanban_color(record.color.raw_value) : ''}"
+                        >
+                            <div
+                                t-attf-class="d-flex flex-column p-0 oe_kanban_card oe_kanban_global_click"
+                            >
+                                <field name="occupation_status" invisible="1" />
+                                <div class="ribbon ribbon_free ribbon-top-right">
+                                    <span>Arrival <field
+                                            name="next_arrival_datetime"
+                                            widget="remaining_days"
+                                        /></span>
+                                </div>
+                                <!-- <div class="ribbon ribbon-top-right" attrs="{'invisible': [('occupation_status', '!=', 'occupied')]}">
+                                    <span>Departure <field name="next_departure_datetime" widget="remaining_days"/></span>
+                                </div>
+                                <div class="ribbon ribbon_out_service ribbon-top-right" attrs="{'invisible': [('occupation_status', '!=', 'out_service')]}">
+                                    <span>Out of Service </span>
+                                </div> -->
+                            </div>
+                            <div class="o_kanban_card_header">
+                                <div class="o_kanban_card_header_title">
+                                    <div class="o_primary col-12">
+                                        <span><t t-esc="record.name.value" /></span>
+                                    </div>
+                                    <!-- <div class="o_kanban_record_subtitle col-12 text-muted">
+                                        <field name="user_id"/>
+                                    </div>
+                                    <field name="is_favorite" widget="boolean_favorite" nolabel="1"/>
+                                    <div t-if="record.alias_name.value and record.alias_domain.value and record.state.raw_value == 'recruit'" class="o_secondary o_job_alias">
+                                        <small> <i class="fa fa-envelope-o" role="img" aria-label="Alias" title="Alias"/> <field name="alias_id"/> </small>
+                                    </div> -->
+                                </div>
+                                <!-- <div class="o_kanban_manage_button_section">
+                                    <a class="o_kanban_manage_toggle_button" href="#"><i class="fa fa-ellipsis-v" role="img" aria-label="Manage" title="Manage"/></a>
+                                </div> -->
+                            </div>
+
+                            <div class="container o_kanban_card_content">
+                                <!-- <t t-if="record.state.raw_value == 'open'">
+                                    <div class="row">
+                                        <div class="col-12 o_kanban_primary_left">
+                                            <button class="btn btn-secondary" name="set_recruit" type="object">Start Recruitment</button>
+                                        </div>
+                                    </div>
+                                </t> -->
+                                <div class="o_primary">
+                                    <span><t t-esc="record.name.value" /></span>
+                                    <t
+                                        t-if="record.next_departure_reservation_id.value"
+                                    >
+                                        <span><t
+                                                t-esc="record.next_departure_reservation_id.value"
+                                            /></span>
+                                    </t>
+                                </div>
+                                <div
+                                    name="kanban_boxes"
+                                    class="row o_room_rack_kanban_boxes"
+                                >
+                                    <!-- <div class="o_room_rack_kanban_box o_kanban_primary_bottom bottom_block" style="padding-left:2px;">
+                                        <div class="o_link_trackers col-12">
+                                            Next Arrival:
+                                            <field name="next_arrival_datetime" widget="remaining_days"/> <br/>
+                                        </div>
+                                    </div> -->
+                                </div>
+                            </div>
+                        </div>
+                    </t>
+                </templates>
+            </kanban>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_pms_room_rack_kanban">
+        <field name="name">Housekeeping</field>
+        <field name="res_model">pms.room</field>
+        <field name="view_mode">kanban,tree,form</field>
+        <field name="search_view_id" ref="room_rack_view_search" />
+        <field
+            name="view_ids"
+            eval="[
+                (5, 0, 0),
+                (0, 0, {'view_mode': 'kanban', 'view_id': ref('pms_room_rack_view_kanban')}),
+                (0, 0, {'view_mode': 'tree', 'view_id': ref('pms_room_rack_view_tree')}),
+                (0, 0, {'view_mode': 'form', 'view_id': ref('pms_room_rack_view_form')}),
+            ]"
+        />
+    </record>
+
+    <menuitem
+        name="Room Rack"
+        id="menu_action_pms_house_keeping_view_rack"
+        action="pms_housekeeping.action_pms_room_rack_kanban"
+        sequence="10"
+        parent="pms_housekeeping.menu_action_pms_house_keeping"
+    />
+
+</odoo>