diff --git a/pms/demo/pms_master_data.xml b/pms/demo/pms_master_data.xml
index 6e45301a7..6d1c7b1c3 100644
--- a/pms/demo/pms_master_data.xml
+++ b/pms/demo/pms_master_data.xml
@@ -309,7 +309,7 @@
         </record>
         <!-- pms.room.type    -->
         <record id="demo_pms_room_type_0" model="pms.room.type">
-            <field name="pms_property_id" ref="pms.demo_pms_property" />
+            <field name="pms_property_ids" eval="[(4, ref('pms.demo_pms_property'))]" />
             <field name="name">Prop. Demo Economic</field>
             <field name="code_type">ECO</field>
             <field name="list_price">21.00</field>
@@ -317,7 +317,7 @@
             <field name="room_amenity_ids" eval="[(4, ref('pms_amenity_0'))]" />
         </record>
         <record id="demo_pms_room_type_1" model="pms.room.type">
-            <field name="pms_property_id" ref="pms.demo_pms_property" />
+            <field name="pms_property_ids" eval="[(4, ref('pms.demo_pms_property'))]" />
             <field name="name">Prop. Demo Single</field>
             <field name="code_type">SNG</field>
             <field name="list_price">20.00</field>
diff --git a/pms/models/pms_checkin_partner.py b/pms/models/pms_checkin_partner.py
index eed942e5f..4acc25465 100644
--- a/pms/models/pms_checkin_partner.py
+++ b/pms/models/pms_checkin_partner.py
@@ -96,7 +96,7 @@ class PmsCheckinPartner(models.Model):
     )
     auto_booking = fields.Boolean("Get in Now", default=False)
     state = fields.Selection(
-        [
+        selection=[
             ("draft", "Pending Entry"),
             ("onboard", "On Board"),
             ("done", "Out"),
diff --git a/pms/models/pms_property.py b/pms/models/pms_property.py
index 5f45beb2a..03d713947 100644
--- a/pms/models/pms_property.py
+++ b/pms/models/pms_property.py
@@ -30,7 +30,7 @@ class PmsProperty(models.Model):
         "user_id",
         string="Accepted Users",
     )
-    room_type_ids = fields.One2many("pms.room.type", "pms_property_id", "Room Types")
+    room_type_ids = fields.Many2many("pms.room.type", "pms_property_ids", "Room Types")
     room_ids = fields.One2many("pms.room", "pms_property_id", "Rooms")
     default_pricelist_id = fields.Many2one(
         "product.pricelist",
diff --git a/pms/models/pms_room.py b/pms/models/pms_room.py
index b1ed74fe0..f8e20b89f 100644
--- a/pms/models/pms_room.py
+++ b/pms/models/pms_room.py
@@ -32,7 +32,7 @@ class PmsRoom(models.Model):
         "pms.property",
         store=True,
         readonly=True,
-        related="room_type_id.pms_property_id",
+        domain="[('id', 'in', room_type_id.pms_property_ids)]",
     )
     room_type_id = fields.Many2one(
         "pms.room.type", "Property Room Type", required=True, ondelete="restrict"
diff --git a/pms/views/pms_room_type_views.xml b/pms/views/pms_room_type_views.xml
index 6e9dc6388..047f8d408 100644
--- a/pms/views/pms_room_type_views.xml
+++ b/pms/views/pms_room_type_views.xml
@@ -27,7 +27,7 @@
                             <field name="class_id" />
                         </group>
                         <group>
-                            <field name="pms_property_id" invisible="0" />
+                            <field name="pms_property_ids" invisible="1" />
                             <field
                                 name="list_price"
                                 widget='monetary'
@@ -82,7 +82,7 @@
         <field name="arch" type="xml">
             <tree string=" Property Room Type">
                 <field name="sequence" widget="handle" />
-                <field name="pms_property_id" />
+                <field name="pms_property_ids" />
                 <field name="name" />
                 <field name="code_type" />
                 <field name="list_price" />