mirror of
https://github.com/OCA/pms.git
synced 2025-01-29 00:17:45 +02:00
[REF] pms: rename code_class and code_board to Odoo standard default_code (#83)
This commit is contained in:
@@ -164,11 +164,11 @@
|
||||
<!-- pms.room.type.class -->
|
||||
<record id="pms_room_type_class_0" model="pms.room.type.class">
|
||||
<field name="name">Room</field>
|
||||
<field name="code_class">RO</field>
|
||||
<field name="default_code">RO</field>
|
||||
</record>
|
||||
<record id="pms_room_type_class_1" model="pms.room.type.class">
|
||||
<field name="name">Conference</field>
|
||||
<field name="code_class">CO</field>
|
||||
<field name="default_code">CO</field>
|
||||
</record>
|
||||
<!-- pms.room.type -->
|
||||
<record id="pms_room_type_0" model="pms.room.type">
|
||||
@@ -331,7 +331,7 @@
|
||||
<!-- pms.board.service -->
|
||||
<record id="pms_board_service_0" model="pms.board.service">
|
||||
<field name="name">BreakFast</field>
|
||||
<field name="code_board">BB</field>
|
||||
<field name="default_code">BB</field>
|
||||
<field
|
||||
name="board_service_line_ids"
|
||||
eval="[(5, 0), (0, 0, {
|
||||
@@ -341,7 +341,7 @@
|
||||
</record>
|
||||
<record id="pms_board_service_1" model="pms.board.service">
|
||||
<field name="name">Half Board</field>
|
||||
<field name="code_board">HB</field>
|
||||
<field name="default_code">HB</field>
|
||||
<field
|
||||
name="board_service_line_ids"
|
||||
eval="[(5, 0), (0, 0, {
|
||||
@@ -354,7 +354,7 @@
|
||||
</record>
|
||||
<record id="pms_board_service_2" model="pms.board.service">
|
||||
<field name="name">FullBoard</field>
|
||||
<field name="code_board">FB</field>
|
||||
<field name="default_code">FB</field>
|
||||
<field
|
||||
name="board_service_line_ids"
|
||||
eval="[(5, 0), (0, 0, {
|
||||
|
||||
@@ -1190,7 +1190,7 @@ msgstr "Razón de Cierre"
|
||||
|
||||
#. module: pms
|
||||
#: model:ir.model.fields,field_description:pms.field_pms_room_type__code_type
|
||||
#: model:ir.model.fields,field_description:pms.field_pms_room_type_class__code_class
|
||||
#: model:ir.model.fields,field_description:pms.field_pms_room_type_class_default_code
|
||||
msgid "Code"
|
||||
msgstr "Código"
|
||||
|
||||
@@ -4652,7 +4652,7 @@ msgid "Room Class"
|
||||
msgstr "Clase de Habitación"
|
||||
|
||||
#. module: pms
|
||||
#: model:ir.model.constraint,message:pms.constraint_pms_room_type_class_code_class_unique
|
||||
#: model:ir.model.constraint,message:pms.constraint_pms_room_type_class_default_code_unique
|
||||
msgid "Room Class Code must be unique!"
|
||||
msgstr "El código de la clase de habitación debe ser único!"
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ class PmsBoardService(models.Model):
|
||||
size=64,
|
||||
translate=True,
|
||||
)
|
||||
code_board = fields.Char(
|
||||
default_code = fields.Char(
|
||||
string="Board Service Code",
|
||||
help="Unique Board Service identification code per property",
|
||||
required=True,
|
||||
@@ -67,21 +67,21 @@ class PmsBoardService(models.Model):
|
||||
record.update({"amount": total})
|
||||
|
||||
@api.model
|
||||
def get_unique_by_property_code(self, pms_property_id, code_board=None):
|
||||
def get_unique_by_property_code(self, pms_property_id, default_code=None):
|
||||
"""
|
||||
:param pms_property_id: property ID
|
||||
:param code_board: board service code (optional)
|
||||
:param default_code: board service code (optional)
|
||||
:return: - recordset of
|
||||
- all the pms.board.service of the pms_property_id
|
||||
if code_board not defined
|
||||
- one or 0 pms.board.service if code_board defined
|
||||
- ValidationError if more than one code_board found by
|
||||
if default_code not defined
|
||||
- one or 0 pms.board.service 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_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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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",
|
||||
}
|
||||
)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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,
|
||||
}
|
||||
)
|
||||
|
||||
@@ -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):
|
||||
|
||||
@@ -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(
|
||||
{
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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",
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -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",
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
@@ -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(
|
||||
# {
|
||||
|
||||
@@ -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,
|
||||
}
|
||||
)
|
||||
|
||||
@@ -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()
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<form string="Board Service Line">
|
||||
<group>
|
||||
<field name="name" />
|
||||
<field name="code_board" />
|
||||
<field name="default_code" />
|
||||
<field
|
||||
name="pms_property_ids"
|
||||
widget="many2many_tags"
|
||||
@@ -31,7 +31,7 @@
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Board Services">
|
||||
<field name="name" />
|
||||
<field name="code_board" />
|
||||
<field name="default_code" />
|
||||
<field name="amount" />
|
||||
<field name="show_detail_report" />
|
||||
</tree>
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
options="{'no_create': True,'no_open': True}"
|
||||
/>
|
||||
<field name="name" />
|
||||
<field name="code_class" />
|
||||
<field name="default_code" />
|
||||
</group>
|
||||
</group>
|
||||
<group colspan="2">
|
||||
@@ -47,7 +47,7 @@
|
||||
<tree string="Room Class">
|
||||
<field name="sequence" widget="handle" />
|
||||
<field name="name" />
|
||||
<field name="code_class" />
|
||||
<field name="default_code" />
|
||||
<field name="room_type_ids" />
|
||||
</tree>
|
||||
</field>
|
||||
|
||||
Reference in New Issue
Block a user