From 3ac507130f02beb5298c6f98360ad180ff9f0f1c Mon Sep 17 00:00:00 2001 From: Eric Antones Date: Fri, 23 Apr 2021 16:50:48 +0200 Subject: [PATCH] [REF] pms: rename code_class and code_board to Odoo standard default_code (#83) --- pms/demo/pms_master_data.xml | 10 +++--- pms/i18n/es.po | 4 +-- pms/models/pms_board_service.py | 34 +++++++++--------- pms/models/pms_room_type_class.py | 36 +++++++++---------- pms/tests/common.py | 2 +- pms/tests/test_pms_availability_plan_rules.py | 2 +- pms/tests/test_pms_board_service.py | 32 ++++++++--------- pms/tests/test_pms_board_service_line.py | 2 +- pms/tests/test_pms_board_service_room_type.py | 2 +- .../test_pms_board_service_room_type_line.py | 4 +-- pms/tests/test_pms_folio.py | 2 +- pms/tests/test_pms_folio_invoice.py | 2 +- pms/tests/test_pms_folio_sale_line.py | 18 +++++----- pms/tests/test_pms_pricelist.py | 2 +- pms/tests/test_pms_pricelist_priority.py | 2 +- pms/tests/test_pms_reservation.py | 6 ++-- pms/tests/test_pms_room_type.py | 4 +-- pms/tests/test_pms_room_type_class.py | 32 ++++++++--------- pms/tests/test_pms_wizard_folio.py | 2 +- pms/tests/test_pms_wizard_massive_changes.py | 2 +- pms/views/pms_board_service_views.xml | 4 +-- pms/views/pms_room_type_class_views.xml | 4 +-- 22 files changed, 104 insertions(+), 104 deletions(-) diff --git a/pms/demo/pms_master_data.xml b/pms/demo/pms_master_data.xml index 26f0c8002..009a87cf5 100644 --- a/pms/demo/pms_master_data.xml +++ b/pms/demo/pms_master_data.xml @@ -164,11 +164,11 @@ Room - RO + RO Conference - CO + CO @@ -331,7 +331,7 @@ BreakFast - BB + BB Half Board - HB + HB FullBoard - FB + FB unify domain = [] - if code_board: - domain += ["&", ("code_board", "=", code_board)] + if default_code: + domain += ["&", ("default_code", "=", default_code)] domain += [ "|", ("pms_property_ids", "in", pms_property_id), @@ -90,22 +90,22 @@ class PmsBoardService(models.Model): records = self.search(domain) res, res_priority = {}, {} for rec in records: - res_priority.setdefault(rec.code_board, -1) + res_priority.setdefault(rec.default_code, -1) priority = rec.pms_property_ids and 1 or 0 - if priority > res_priority[rec.code_board]: - res.setdefault(rec.code_board, rec.id) - res[rec.code_board], res_priority[rec.code_board] = rec.id, priority - elif priority == res_priority[rec.code_board]: + if priority > res_priority[rec.default_code]: + res.setdefault(rec.default_code, rec.id) + res[rec.default_code], res_priority[rec.default_code] = rec.id, priority + elif priority == res_priority[rec.default_code]: raise ValidationError( _( "Integrity error: There's multiple board services " "with the same code %s and properties" ) - % rec.code_board + % rec.default_code ) return self.browse(list(res.values())) - @api.constrains("code_board", "pms_property_ids") + @api.constrains("default_code", "pms_property_ids") def _check_code_property_uniqueness(self): # TODO: similiar code as room.type -> unify msg = _( @@ -116,7 +116,7 @@ class PmsBoardService(models.Model): if self.search( [ ("id", "!=", rec.id), - ("code_board", "=", rec.code_board), + ("default_code", "=", rec.default_code), ("pms_property_ids", "=", False), ] ): @@ -124,7 +124,7 @@ class PmsBoardService(models.Model): else: for pms_property in rec.pms_property_ids: other = rec.get_unique_by_property_code( - pms_property.id, rec.code_board + pms_property.id, rec.default_code ) if other and other != rec: raise ValidationError(msg) diff --git a/pms/models/pms_room_type_class.py b/pms/models/pms_room_type_class.py index 9f676948a..22448d4c6 100644 --- a/pms/models/pms_room_type_class.py +++ b/pms/models/pms_room_type_class.py @@ -15,7 +15,7 @@ class PmsRoomTypeClass(models.Model): _name = "pms.room.type.class" _description = "Room Type Class" - _order = "sequence, name, code_class" + _order = "sequence, name, default_code" name = fields.Char( string="Class Name", @@ -49,26 +49,26 @@ class PmsRoomTypeClass(models.Model): comodel_name="pms.room.type", inverse_name="class_id", ) - code_class = fields.Char( + default_code = fields.Char( string="Code", help="Room type class identification code", required=True ) @api.model - def get_unique_by_property_code(self, pms_property_id, code_class=None): + def get_unique_by_property_code(self, pms_property_id, default_code=None): """ :param pms_property_id: property ID - :param code_class: room type code (optional) + :param default_code: room type code (optional) :return: - recordset of - all the pms.room.type.class of the pms_property_id - if code_class not defined - - one or 0 pms.room.type.class if code_class defined - - ValidationError if more than one code_class found by + if default_code not defined + - one or 0 pms.room.type.class if default_code defined + - ValidationError if more than one default_code found by the same pms_property_id """ # TODO: similiar code as room.type -> unify domain = [] - if code_class: - domain += ["&", ("code_class", "=", code_class)] + if default_code: + domain += ["&", ("default_code", "=", default_code)] domain += [ "|", ("pms_property_ids", "in", pms_property_id), @@ -77,22 +77,22 @@ class PmsRoomTypeClass(models.Model): records = self.search(domain) res, res_priority = {}, {} for rec in records: - res_priority.setdefault(rec.code_class, -1) + res_priority.setdefault(rec.default_code, -1) priority = rec.pms_property_ids and 1 or 0 - if priority > res_priority[rec.code_class]: - res.setdefault(rec.code_class, rec.id) - res[rec.code_class], res_priority[rec.code_class] = rec.id, priority - elif priority == res_priority[rec.code_class]: + if priority > res_priority[rec.default_code]: + res.setdefault(rec.default_code, rec.id) + res[rec.default_code], res_priority[rec.default_code] = rec.id, priority + elif priority == res_priority[rec.default_code]: raise ValidationError( _( "Integrity error: There's multiple room types " "with the same code %s and properties" ) - % rec.code_class + % rec.default_code ) return self.browse(list(res.values())) - @api.constrains("code_class", "pms_property_ids") + @api.constrains("default_code", "pms_property_ids") def _check_code_property_uniqueness(self): # TODO: similiar code as room.type -> unify msg = _( @@ -103,7 +103,7 @@ class PmsRoomTypeClass(models.Model): if self.search( [ ("id", "!=", rec.id), - ("code_class", "=", rec.code_class), + ("default_code", "=", rec.default_code), ("pms_property_ids", "=", False), ] ): @@ -111,7 +111,7 @@ class PmsRoomTypeClass(models.Model): else: for pms_property in rec.pms_property_ids: other = rec.get_unique_by_property_code( - pms_property.id, rec.code_class + pms_property.id, rec.default_code ) if other and other != rec: raise ValidationError(msg) diff --git a/pms/tests/common.py b/pms/tests/common.py index 3f5c6ccf6..e79743bb5 100644 --- a/pms/tests/common.py +++ b/pms/tests/common.py @@ -24,6 +24,6 @@ class TestPms(common.SavepointCase): self.room_type_class1 = self.env["pms.room.type.class"].create( { "name": "Room Type Class 1", - "code_class": "RTC1", + "default_code": "RTC1", } ) diff --git a/pms/tests/test_pms_availability_plan_rules.py b/pms/tests/test_pms_availability_plan_rules.py index 83478dc9b..bf3c65d45 100644 --- a/pms/tests/test_pms_availability_plan_rules.py +++ b/pms/tests/test_pms_availability_plan_rules.py @@ -66,7 +66,7 @@ class TestPmsRoomTypeAvailabilityRules(common.SavepointCase): ) # pms.room.type.class self.test_room_type_class = self.env["pms.room.type.class"].create( - {"name": "Room", "code_class": "ROOM"} + {"name": "Room", "default_code": "ROOM"} ) # pms.room.type diff --git a/pms/tests/test_pms_board_service.py b/pms/tests/test_pms_board_service.py index f02c7b5ff..e96049dd2 100644 --- a/pms/tests/test_pms_board_service.py +++ b/pms/tests/test_pms_board_service.py @@ -41,7 +41,7 @@ class TestBoardService(TestPms): self.env["pms.board.service"].create( { "name": "Board service bs1", - "code_board": "c1", + "default_code": "c1", "pms_property_ids": [(6, 0, [self.pms_property1.id])], } ) @@ -54,7 +54,7 @@ class TestBoardService(TestPms): self.env["pms.board.service"].create( { "name": "Board service bs2", - "code_board": "c1", + "default_code": "c1", "pms_property_ids": [(6, 0, [self.pms_property1.id])], } ) @@ -86,7 +86,7 @@ class TestBoardService(TestPms): self.env["pms.board.service"].create( { "name": "Board service 1", - "code_board": "c1", + "default_code": "c1", "pms_property_ids": [(6, 0, [self.pms_property1.id])], } ) @@ -99,7 +99,7 @@ class TestBoardService(TestPms): self.env["pms.board.service"].create( { "name": "Board service bs2", - "code_board": "c1", + "default_code": "c1", "pms_property_ids": [ ( 6, @@ -128,7 +128,7 @@ class TestBoardService(TestPms): board_service1 = self.env["pms.board.service"].create( { "name": "Board service 1", - "code_board": "c1", + "default_code": "c1", "pms_property_ids": [ (6, 0, [self.pms_property1.id, self.pms_property3.id]) ], @@ -162,7 +162,7 @@ class TestBoardService(TestPms): bs1 = self.env["pms.board.service"].create( { "name": "Board service 1", - "code_board": "c1", + "default_code": "c1", "pms_property_ids": [ (6, 0, [self.pms_property1.id, self.pms_property3.id]) ], @@ -199,7 +199,7 @@ class TestBoardService(TestPms): self.env["pms.board.service"].create( { "name": "Board service 1", - "code_board": "c1", + "default_code": "c1", "pms_property_ids": [ (6, 0, [self.pms_property1.id, self.pms_property2.id]) ], @@ -229,7 +229,7 @@ class TestBoardService(TestPms): board_service1 = self.env["pms.board.service"].create( { "name": "Board service 1", - "code_board": "c1", + "default_code": "c1", "pms_property_ids": False, } ) @@ -264,7 +264,7 @@ class TestBoardService(TestPms): board_service1 = self.env["pms.board.service"].create( { "name": "Board service 1", - "code_board": "c1", + "default_code": "c1", "pms_property_ids": [ (6, 0, [self.pms_property1.id, self.pms_property3.id]) ], @@ -274,7 +274,7 @@ class TestBoardService(TestPms): self.env["pms.board.service"].create( { "name": "Board service bs2", - "code_board": "c1", + "default_code": "c1", "pms_property_ids": False, } ) @@ -316,14 +316,14 @@ class TestBoardService(TestPms): self.env["pms.board.service"].create( { "name": "Board service 1", - "code_board": "c1", + "default_code": "c1", "pms_property_ids": [(6, 0, [self.pms_property1.id])], } ) board_service2 = self.env["pms.board.service"].create( { "name": "Board service bs2", - "code_board": "c1", + "default_code": "c1", "pms_property_ids": False, } ) @@ -358,14 +358,14 @@ class TestBoardService(TestPms): self.env["pms.board.service"].create( { "name": "Board service bs1", - "code_board": "c1", + "default_code": "c1", "pms_property_ids": [(6, 0, [self.pms_property1.id])], } ) board_service2 = self.env["pms.board.service"].create( { "name": "Board service bs2", - "code_board": "c1", + "default_code": "c1", "pms_property_ids": False, } ) @@ -400,14 +400,14 @@ class TestBoardService(TestPms): self.env["pms.board.service"].create( { "name": "Board service 1", - "code_board": "c1", + "default_code": "c1", "pms_property_ids": [(6, 0, [self.pms_property1.id])], } ) board_service2 = self.env["pms.board.service"].create( { "name": "Board service bs2", - "code_board": "c1", + "default_code": "c1", "pms_property_ids": False, } ) diff --git a/pms/tests/test_pms_board_service_line.py b/pms/tests/test_pms_board_service_line.py index 4721021fd..d341228fb 100644 --- a/pms/tests/test_pms_board_service_line.py +++ b/pms/tests/test_pms_board_service_line.py @@ -60,7 +60,7 @@ class TestPmsBoardService(common.SavepointCase): self.board_service = self.env["pms.board.service"].create( { "name": "Board Service", - "code_board": "CB", + "default_code": "CB", } ) 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 2cf5f11d3..6a109a851 100644 --- a/pms/tests/test_pms_board_service_room_type.py +++ b/pms/tests/test_pms_board_service_room_type.py @@ -58,7 +58,7 @@ class TestPmsBoardServiceRoomType(common.SavepointCase): } ) self.room_type_class = self.env["pms.room.type.class"].create( - {"name": "Room Type Class", "code_class": "SIN1"} + {"name": "Room Type Class", "default_code": "SIN1"} ) self.room_type = self.env["pms.room.type"].create( { 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 1c9a6eb3c..e711e9ac5 100644 --- a/pms/tests/test_pms_board_service_room_type_line.py +++ b/pms/tests/test_pms_board_service_room_type_line.py @@ -56,14 +56,14 @@ class TestPmsBoardServiceRoomTypeLine(common.SavepointCase): self.board_service = self.env["pms.board.service"].create( { "name": "Board Service", - "code_board": "CB", + "default_code": "CB", } ) self.room_type_class = self.env["pms.room.type.class"].create( { "name": "Room Type Class", "pms_property_ids": self.property1, - "code_class": "SIN1", + "default_code": "SIN1", } ) self.room_type = self.env["pms.room.type"].create( diff --git a/pms/tests/test_pms_folio.py b/pms/tests/test_pms_folio.py index e4a0f06f3..a7f0df32d 100644 --- a/pms/tests/test_pms_folio.py +++ b/pms/tests/test_pms_folio.py @@ -54,7 +54,7 @@ class TestPmsFolio(common.SavepointCase): # create room type class self.room_type_class = self.env["pms.room.type.class"].create( - {"name": "Room", "code_class": "ROOM"} + {"name": "Room", "default_code": "ROOM"} ) # create room type diff --git a/pms/tests/test_pms_folio_invoice.py b/pms/tests/test_pms_folio_invoice.py index cff592766..f2da8e3b6 100644 --- a/pms/tests/test_pms_folio_invoice.py +++ b/pms/tests/test_pms_folio_invoice.py @@ -50,7 +50,7 @@ class TestPmsFolioInvoice(common.SavepointCase): ) # create room type class self.room_type_class = self.env["pms.room.type.class"].create( - {"name": "Room", "code_class": "ROOM"} + {"name": "Room", "default_code": "ROOM"} ) # create room type diff --git a/pms/tests/test_pms_folio_sale_line.py b/pms/tests/test_pms_folio_sale_line.py index 70ecfd18c..8e80126e0 100644 --- a/pms/tests/test_pms_folio_sale_line.py +++ b/pms/tests/test_pms_folio_sale_line.py @@ -21,7 +21,7 @@ class TestPmsFolioSaleLine(TestPms): # create room type class self.room_type_class = self.env["pms.room.type.class"].create( - {"name": "Room", "code_class": "ROOM"} + {"name": "Room", "default_code": "ROOM"} ) # create room type @@ -325,7 +325,7 @@ class TestPmsFolioSaleLine(TestPms): board_service_test = self.board_service = self.env["pms.board.service"].create( { "name": "Test Board Service", - "code_board": "TPS", + "default_code": "TPS", } ) self.env["pms.board.service.line"].create( @@ -386,7 +386,7 @@ class TestPmsFolioSaleLine(TestPms): board_service_test = self.board_service = self.env["pms.board.service"].create( { "name": "Test Board Service", - "code_board": "TPS", + "default_code": "TPS", } ) self.env["pms.board.service.line"].create( @@ -446,7 +446,7 @@ class TestPmsFolioSaleLine(TestPms): board_service_test = self.board_service = self.env["pms.board.service"].create( { "name": "Test Board Service", - "code_board": "TPS", + "default_code": "TPS", } ) self.env["pms.board.service.line"].create( @@ -509,7 +509,7 @@ class TestPmsFolioSaleLine(TestPms): board_service_test = self.board_service = self.env["pms.board.service"].create( { "name": "Test Board Service", - "code_board": "TPS", + "default_code": "TPS", } ) self.env["pms.board.service.line"].create( @@ -572,7 +572,7 @@ class TestPmsFolioSaleLine(TestPms): board_service_test = self.board_service = self.env["pms.board.service"].create( { "name": "Test Board Service", - "code_board": "TPS", + "default_code": "TPS", } ) self.env["pms.board.service.line"].create( @@ -633,7 +633,7 @@ class TestPmsFolioSaleLine(TestPms): board_service_test = self.board_service = self.env["pms.board.service"].create( { "name": "Test Board Service", - "code_board": "TPS", + "default_code": "TPS", } ) self.env["pms.board.service.line"].create( @@ -695,7 +695,7 @@ class TestPmsFolioSaleLine(TestPms): board_service_test = self.board_service = self.env["pms.board.service"].create( { "name": "Test Board Service", - "code_board": "TPS", + "default_code": "TPS", } ) @@ -762,7 +762,7 @@ class TestPmsFolioSaleLine(TestPms): board_service_test = self.board_service = self.env["pms.board.service"].create( { "name": "Test Board Service", - "code_board": "TPS", + "default_code": "TPS", } ) diff --git a/pms/tests/test_pms_pricelist.py b/pms/tests/test_pms_pricelist.py index 0b780134f..401efda59 100644 --- a/pms/tests/test_pms_pricelist.py +++ b/pms/tests/test_pms_pricelist.py @@ -66,7 +66,7 @@ class TestPmsPricelist(common.SavepointCase): } ) self.room_type_class = self.env["pms.room.type.class"].create( - {"name": "Room Class", "code_class": "ROOM"} + {"name": "Room Class", "default_code": "ROOM"} ) self.room_type = self.env["pms.room.type"].create( diff --git a/pms/tests/test_pms_pricelist_priority.py b/pms/tests/test_pms_pricelist_priority.py index 8c41b11e4..d81396952 100644 --- a/pms/tests/test_pms_pricelist_priority.py +++ b/pms/tests/test_pms_pricelist_priority.py @@ -69,7 +69,7 @@ class TestPmsPricelistRules(common.SavepointCase): ) self.room_type_class = self.env["pms.room.type.class"].create( - {"name": "Room Class", "code_class": "ROOM"} + {"name": "Room Class", "default_code": "ROOM"} ) self.room_type = self.env["pms.room.type"].create( diff --git a/pms/tests/test_pms_reservation.py b/pms/tests/test_pms_reservation.py index adc32949b..4d45dc18f 100644 --- a/pms/tests/test_pms_reservation.py +++ b/pms/tests/test_pms_reservation.py @@ -63,7 +63,7 @@ class TestPmsReservations(common.SavepointCase): # create room type class self.room_type_class = self.env["pms.room.type.class"].create( - {"name": "Room", "code_class": "ROOM"} + {"name": "Room", "default_code": "ROOM"} ) # create room type @@ -140,13 +140,13 @@ class TestPmsReservations(common.SavepointCase): } ) self.room_type_class = self.env["pms.room.type.class"].create( - {"name": "Room Class", "code_class": "RCTEST"} + {"name": "Room Class", "default_code": "RCTEST"} ) self.board_service = self.env["pms.board.service"].create( { "name": "Board Service Test", - "code_board": "CB", + "default_code": "CB", } ) diff --git a/pms/tests/test_pms_room_type.py b/pms/tests/test_pms_room_type.py index cb4875afd..a2722fff1 100644 --- a/pms/tests/test_pms_room_type.py +++ b/pms/tests/test_pms_room_type.py @@ -720,7 +720,7 @@ class TestRoomType(TestPms): room_type_class = self.env["pms.room.type.class"].create( { "name": "Room Type Class", - "code_class": "ROOM", + "default_code": "ROOM", "pms_property_ids": [ (4, self.pms_property2.id), ], @@ -747,7 +747,7 @@ class TestRoomType(TestPms): # def test_check_board_service_property_integrity(self): # # self.room_type_class = self.env["pms.room.type.class"].create( - # {"name": "Room Type Class", "code_class": "SIN1"} + # {"name": "Room Type Class", "default_code": "SIN1"} # ) # self.room_type = self.env["pms.room.type"].create( # { diff --git a/pms/tests/test_pms_room_type_class.py b/pms/tests/test_pms_room_type_class.py index 318f3b73a..b5dc0c1ac 100644 --- a/pms/tests/test_pms_room_type_class.py +++ b/pms/tests/test_pms_room_type_class.py @@ -41,7 +41,7 @@ class TestRoomTypeClass(TestPms): self.env["pms.room.type.class"].create( { "name": "Room type class cl1", - "code_class": "c1", + "default_code": "c1", "pms_property_ids": [(6, 0, [self.pms_property1.id])], } ) @@ -54,7 +54,7 @@ class TestRoomTypeClass(TestPms): self.env["pms.room.type.class"].create( { "name": "Room type class cl2", - "code_class": "c1", + "default_code": "c1", "pms_property_ids": [(6, 0, [self.pms_property1.id])], } ) @@ -86,7 +86,7 @@ class TestRoomTypeClass(TestPms): self.env["pms.room.type.class"].create( { "name": "Room type class 1", - "code_class": "c1", + "default_code": "c1", "pms_property_ids": [(6, 0, [self.pms_property1.id])], } ) @@ -99,7 +99,7 @@ class TestRoomTypeClass(TestPms): self.env["pms.room.type.class"].create( { "name": "Room type class cl2", - "code_class": "c1", + "default_code": "c1", "pms_property_ids": [ ( 6, @@ -128,7 +128,7 @@ class TestRoomTypeClass(TestPms): room_type_class1 = self.env["pms.room.type.class"].create( { "name": "Room type class 1", - "code_class": "c1", + "default_code": "c1", "pms_property_ids": [ (6, 0, [self.pms_property1.id, self.pms_property3.id]) ], @@ -162,7 +162,7 @@ class TestRoomTypeClass(TestPms): cl1 = self.env["pms.room.type.class"].create( { "name": "Room type class 1", - "code_class": "c1", + "default_code": "c1", "pms_property_ids": [ (6, 0, [self.pms_property1.id, self.pms_property3.id]) ], @@ -201,7 +201,7 @@ class TestRoomTypeClass(TestPms): self.env["pms.room.type.class"].create( { "name": "Room type class 1", - "code_class": "c1", + "default_code": "c1", "pms_property_ids": [ (6, 0, [self.pms_property1.id, self.pms_property2.id]) ], @@ -231,7 +231,7 @@ class TestRoomTypeClass(TestPms): room_type_class1 = self.env["pms.room.type.class"].create( { "name": "Room type class 1", - "code_class": "c1", + "default_code": "c1", "pms_property_ids": False, } ) @@ -266,7 +266,7 @@ class TestRoomTypeClass(TestPms): room_type_class1 = self.env["pms.room.type.class"].create( { "name": "Room type class 1", - "code_class": "c1", + "default_code": "c1", "pms_property_ids": [ (6, 0, [self.pms_property1.id, self.pms_property3.id]) ], @@ -276,7 +276,7 @@ class TestRoomTypeClass(TestPms): self.env["pms.room.type.class"].create( { "name": "Room type class cl2", - "code_class": "c1", + "default_code": "c1", "pms_property_ids": False, } ) @@ -318,14 +318,14 @@ class TestRoomTypeClass(TestPms): self.env["pms.room.type.class"].create( { "name": "Room type class 1", - "code_class": "c1", + "default_code": "c1", "pms_property_ids": [(6, 0, [self.pms_property1.id])], } ) room_type_class2 = self.env["pms.room.type.class"].create( { "name": "Room type class cl2", - "code_class": "c1", + "default_code": "c1", "pms_property_ids": False, } ) @@ -360,14 +360,14 @@ class TestRoomTypeClass(TestPms): self.env["pms.room.type.class"].create( { "name": "Room type class cl1", - "code_class": "c1", + "default_code": "c1", "pms_property_ids": [(6, 0, [self.pms_property1.id])], } ) room_type_class2 = self.env["pms.room.type.class"].create( { "name": "Room type class cl2", - "code_class": "c1", + "default_code": "c1", "pms_property_ids": False, } ) @@ -402,14 +402,14 @@ class TestRoomTypeClass(TestPms): self.env["pms.room.type.class"].create( { "name": "Room type class 1", - "code_class": "c1", + "default_code": "c1", "pms_property_ids": [(6, 0, [self.pms_property1.id])], } ) room_type_class2 = self.env["pms.room.type.class"].create( { "name": "Room type class cl2", - "code_class": "c1", + "default_code": "c1", "pms_property_ids": False, } ) diff --git a/pms/tests/test_pms_wizard_folio.py b/pms/tests/test_pms_wizard_folio.py index eadf94cc8..cef426af4 100644 --- a/pms/tests/test_pms_wizard_folio.py +++ b/pms/tests/test_pms_wizard_folio.py @@ -66,7 +66,7 @@ class TestPmsWizardMassiveChanges(common.SavepointCase): # CREATION OF ROOM TYPE CLASS self.test_room_type_class = self.env["pms.room.type.class"].create( - {"name": "Room", "code_class": "ROOM"} + {"name": "Room", "default_code": "ROOM"} ) self.test_room_type_class.flush() diff --git a/pms/tests/test_pms_wizard_massive_changes.py b/pms/tests/test_pms_wizard_massive_changes.py index 5d9cff98c..dc81206df 100644 --- a/pms/tests/test_pms_wizard_massive_changes.py +++ b/pms/tests/test_pms_wizard_massive_changes.py @@ -59,7 +59,7 @@ class TestPmsWizardMassiveChanges(common.SavepointCase): ) # pms.room.type.class self.test_room_type_class = self.env["pms.room.type.class"].create( - {"name": "Room", "code_class": "ROOM"} + {"name": "Room", "default_code": "ROOM"} ) # pms.room.type diff --git a/pms/views/pms_board_service_views.xml b/pms/views/pms_board_service_views.xml index 2b1ca9855..cc6da3576 100644 --- a/pms/views/pms_board_service_views.xml +++ b/pms/views/pms_board_service_views.xml @@ -7,7 +7,7 @@
- + - + diff --git a/pms/views/pms_room_type_class_views.xml b/pms/views/pms_room_type_class_views.xml index e47f2bc9e..fc13f2bad 100644 --- a/pms/views/pms_room_type_class_views.xml +++ b/pms/views/pms_room_type_class_views.xml @@ -28,7 +28,7 @@ options="{'no_create': True,'no_open': True}" /> - + @@ -47,7 +47,7 @@ - +