diff --git a/pms/models/pms_property.py b/pms/models/pms_property.py
index 51de42f5c..40d9728bc 100644
--- a/pms/models/pms_property.py
+++ b/pms/models/pms_property.py
@@ -38,6 +38,12 @@ class PmsProperty(models.Model):
         index=True,
         ondelete="restrict",
     )
+    parent_id = fields.Many2one(
+        comodel_name="pms.property", string="Parent Property", index=True
+    )
+    child_ids = fields.One2many(
+        comodel_name="pms.property", inverse_name="parent_id", string="Child Properties"
+    )
     pms_property_code = fields.Char(
         string="Property Code",
         help="Short name property",
diff --git a/pms/views/pms_folio_views.xml b/pms/views/pms_folio_views.xml
index 1649218ae..c20f098ef 100644
--- a/pms/views/pms_folio_views.xml
+++ b/pms/views/pms_folio_views.xml
@@ -822,6 +822,7 @@
                         string="Property"
                         enable_counters="1"
                         icon="fa-h-square"
+                        domain="[('company_id', '=', company_id)]"
                     />
                     <field
                         name="state"
diff --git a/pms/views/pms_reservation_views.xml b/pms/views/pms_reservation_views.xml
index d80a94bd5..f47afabfa 100644
--- a/pms/views/pms_reservation_views.xml
+++ b/pms/views/pms_reservation_views.xml
@@ -1106,6 +1106,7 @@
                         string="Property"
                         enable_counters="1"
                         icon="fa-h-square"
+                        domain="[('company_id', '=', company_id])]"
                     />
                     <field
                         name="state"
diff --git a/pms/views/pms_room_views.xml b/pms/views/pms_room_views.xml
index d3513bbe3..37939044a 100644
--- a/pms/views/pms_room_views.xml
+++ b/pms/views/pms_room_views.xml
@@ -150,11 +150,18 @@
                 <field name="room_amenity_ids" />
                 <newline />
                 <searchpanel>
+                    <field
+                        name="company_id"
+                        string="Company"
+                        enable_counters="1"
+                        icon="fa-building"
+                    />
                     <field
                         name="pms_property_id"
                         string="Property"
                         enable_counters="1"
                         select="multi"
+                        domain="[('company_id', '=', company_id)]"
                     />
                     <field
                         name="room_type_id"