From e3b19793f1552b956045a3c7477e0a518ae698dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dar=C3=ADo=20Lodeiros?= Date: Sun, 7 Mar 2021 17:03:24 +0100 Subject: [PATCH] [FIX]pms: Board price_type del --- pms/models/pms_reservation.py | 7 ++----- pms/tests/test_pms_board_service_line.py | 1 - pms/tests/test_pms_board_service_room_type.py | 6 +++--- pms/tests/test_pms_board_service_room_type_line.py | 5 +++-- pms/tests/test_pms_room_type.py | 5 +++-- pms/views/pms_reservation_views.xml | 7 +------ 6 files changed, 12 insertions(+), 19 deletions(-) diff --git a/pms/models/pms_reservation.py b/pms/models/pms_reservation.py index 507906805..04015fc96 100644 --- a/pms/models/pms_reservation.py +++ b/pms/models/pms_reservation.py @@ -57,9 +57,8 @@ class PmsReservation(models.Model): # Fields declaration name = fields.Text( - "Reservation Description", - readonly=False, - required=True, + "Reservation Id", + readonly=True, ) priority = fields.Integer(compute="_compute_priority", store="True", index=True) @@ -640,8 +639,6 @@ class PmsReservation(models.Model): reservation.partner_id = reservation.folio_id.partner_id elif reservation.agency_id: reservation.partner_id = reservation.agency_id - else: - raise ValidationError(_("Partner is requires on reservation")) @api.depends("partner_id") def _compute_partner_invoice_id(self): diff --git a/pms/tests/test_pms_board_service_line.py b/pms/tests/test_pms_board_service_line.py index d16f2feec..50b06a2ec 100644 --- a/pms/tests/test_pms_board_service_line.py +++ b/pms/tests/test_pms_board_service_line.py @@ -31,7 +31,6 @@ class TestPmsBoardService(TestHotel): self.board_service = self.env["pms.board.service"].create( { "name": "Board Service", - "price_type": "fixed", } ) with self.assertRaises(ValidationError): diff --git a/pms/tests/test_pms_board_service_room_type.py b/pms/tests/test_pms_board_service_room_type.py index 5bdaac266..b598c1aae 100644 --- a/pms/tests/test_pms_board_service_room_type.py +++ b/pms/tests/test_pms_board_service_room_type.py @@ -25,7 +25,9 @@ class TestPmsBoardServiceRoomType(TestHotel): } ) self.board_service = self.env["pms.board.service"].create( - {"name": "Board Service", "price_type": "fixed"} + { + "name": "Board Service", + } ) self.room_type_class = self.env["pms.room.type.class"].create( {"name": "Room Type Class", "code_class": "SIN1"} @@ -48,7 +50,6 @@ class TestPmsBoardServiceRoomType(TestHotel): { "pms_board_service_id": self.board_service.id, "pms_room_type_id": self.room_type.id, - "price_type": "fixed", "pms_property_ids": self.property2, } ) @@ -63,7 +64,6 @@ class TestPmsBoardServiceRoomType(TestHotel): { "pms_board_service_id": self.board_service.id, "pms_room_type_id": self.room_type.id, - "price_type": "fixed", "pricelist_id": self.pricelist.id, "pms_property_ids": self.property2, } diff --git a/pms/tests/test_pms_board_service_room_type_line.py b/pms/tests/test_pms_board_service_room_type_line.py index 74fa31bf6..20510edaf 100644 --- a/pms/tests/test_pms_board_service_room_type_line.py +++ b/pms/tests/test_pms_board_service_room_type_line.py @@ -25,7 +25,9 @@ class TestPmsBoardServiceRoomTypeLine(TestHotel): } ) self.board_service = self.env["pms.board.service"].create( - {"name": "Board Service", "price_type": "fixed"} + { + "name": "Board Service", + } ) self.room_type_class = self.env["pms.room.type.class"].create( { @@ -45,7 +47,6 @@ class TestPmsBoardServiceRoomTypeLine(TestHotel): { "pms_board_service_id": self.board_service.id, "pms_room_type_id": self.room_type.id, - "price_type": "fixed", "pms_property_ids": self.property1, } ) diff --git a/pms/tests/test_pms_room_type.py b/pms/tests/test_pms_room_type.py index 5a0e65398..6bae3bbfb 100644 --- a/pms/tests/test_pms_room_type.py +++ b/pms/tests/test_pms_room_type.py @@ -758,14 +758,15 @@ class TestRoomTypeCodePropertyUniqueness(TestRoomType): } ) self.board_service = self.env["pms.board.service"].create( - {"name": "Board Service", "price_type": "fixed"} + { + "name": "Board Service", + } ) with self.assertRaises(ValidationError): self.env["pms.board.service.room.type"].create( { "pms_board_service_id": self.board_service.id, "pms_room_type_id": self.room_type.id, - "price_type": "fixed", "pricelist_id": self.env.ref("product.list0").id, "pms_property_ids": self.property2, } diff --git a/pms/views/pms_reservation_views.xml b/pms/views/pms_reservation_views.xml index d839f58c3..b11ca981b 100644 --- a/pms/views/pms_reservation_views.xml +++ b/pms/views/pms_reservation_views.xml @@ -173,6 +173,7 @@ OverBooking!

+ -