From 392502cfd5e8ec81331cf7e4afa1f92f6a38d0c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dar=C3=ADo=20Lodeiros?= Date: Fri, 23 Oct 2020 11:18:31 +0200 Subject: [PATCH] [REF] Change pms_room_type (m2o->m2m) pms_property --- pms/demo/pms_master_data.xml | 4 ++-- pms/models/pms_checkin_partner.py | 2 +- pms/models/pms_property.py | 2 +- pms/models/pms_room.py | 2 +- pms/views/pms_room_type_views.xml | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) 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 @@ - + Prop. Demo Economic ECO 21.00 @@ -317,7 +317,7 @@ - + Prop. Demo Single SNG 20.00 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 @@ - + - +