Skip to content

[IMP] pms: add active field to board service #402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DarioLodeiros wants to merge 1 commit into
base: 16.0
Choose a base branch
from
Open

[IMP] pms: add active field to board service #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions pms/models/pms_board_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,23 @@ class PmsBoardService(models.Model):
show_detail_report = fields.Boolean(
help="True if you want that board service detail to be shown on the report",
)
active = fields.Boolean(
default=True,
help="If unchecked, this board service will be archived and hidden from "
"selections without affecting historical records that reference it.",
)

def write(self, vals):
res = super().write(vals)
if "active" in vals:
new_state = vals["active"]
self.with_context(active_test=False).mapped("board_service_line_ids").write(
{"active": new_state}
)
self.with_context(active_test=False).mapped(
"pms_board_service_room_type_ids"
).write({"active": new_state})
return res

@api.depends("board_service_line_ids.amount")
def _compute_board_amount(self):
Expand Down
4 changes: 4 additions & 0 deletions pms/models/pms_board_service_line.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ class PmsBoardServiceLine(models.Model):
help="Apply service to children",
default=False,
)
active = fields.Boolean(
default=True,
help="Lines of an archived board service are archived as well.",
)

def _get_default_price(self):
if self.product_id:
Expand Down
25 changes: 18 additions & 7 deletions pms/models/pms_board_service_room_type.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,24 @@ class PmsBoardServiceRoomType(models.Model):
help="Pricelists where this Board Service is available",
comodel_name="product.pricelist",
)
active = fields.Boolean(
default=True,
help="If unchecked, this board service room type assignment will be "
"archived and hidden from selections without affecting historical "
"reservations that reference it.",
)

def write(self, vals):
if "pms_board_service_id" in vals and "board_service_line_ids" not in vals:
vals.update(
self.prepare_board_service_reservation_ids(vals["pms_board_service_id"])
)
res = super().write(vals)
if "active" in vals:
self.with_context(active_test=False).mapped("board_service_line_ids").write(
{"active": vals["active"]}
)
return res

@api.depends("board_service_line_ids.amount")
def _compute_board_amount(self):
Expand Down Expand Up @@ -136,13 +154,6 @@ def create(self, vals_list):
)
return super().create(vals_list)

def write(self, vals):
if "pms_board_service_id" in vals and "board_service_line_ids" not in vals:
vals.update(
self.prepare_board_service_reservation_ids(vals["pms_board_service_id"])
)
return super().write(vals)

@api.model
def prepare_board_service_reservation_ids(self, board_service_id):
"""
Expand Down
4 changes: 4 additions & 0 deletions pms/models/pms_board_service_room_type_line.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ class PmsBoardServiceRoomTypeLine(models.Model):
help="Apply service to children",
default=False,
)
active = fields.Boolean(
default=True,
help="Lines of an archived board service room type are archived as well.",
)

def _default_amount(self):
return self.product_id.list_price
Expand Down
74 changes: 74 additions & 0 deletions pms/tests/test_pms_board_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,3 +409,77 @@ def test_search_bs_code_no_properties(self):
board_service2.id,
"Expected board service not found",
)

def test_archive_board_service_propagates_to_children(self):
"""
Archiving a board service must cascade ``active=False`` to its
lines and to its room-type assignments (and their lines), so that
the archived regime fully disappears from operative selections
while historical references remain in place.

PRE: - board_service bs1 is active
- bs1 has one line (bsl)
- bs1 has one room-type assignment (bsrt) with one line (bsrtl)
ACT: - bs1.active = False
POST: - bsl.active == False
- bsrt.active == False
- bsrtl.active == False
- reactivating bs1 propagates back to all descendants
"""
# ARRANGE
product = self.env["product.product"].create(
{"name": "Bs Product", "is_pms_available": True}
)
room_type = self.env["pms.room.type"].create(
{
"pms_property_ids": [(6, 0, [self.pms_property1.id])],
"name": "Room Type Archive Test",
"default_code": "RTAT",
"class_id": self.room_type_class1.id,
"list_price": 30.0,
}
)
board_service = self.env["pms.board.service"].create(
{
"name": "Bs Archive Test",
"default_code": "BSAT",
"pms_property_ids": [(6, 0, [self.pms_property1.id])],
"board_service_line_ids": [
(0, 0, {"product_id": product.id, "adults": True}),
],
}
)
bsrt = self.env["pms.board.service.room.type"].create(
{
"pms_board_service_id": board_service.id,
"pms_room_type_id": room_type.id,
"pms_property_id": self.pms_property1.id,
}
)

# ACT — archive
board_service.active = False

# ASSERT — propagation downwards
bs_line = board_service.with_context(active_test=False).board_service_line_ids
bsrt_line = bsrt.with_context(active_test=False).board_service_line_ids
self.assertFalse(bs_line.active, "Board service line was not archived")
self.assertFalse(
bsrt.with_context(active_test=False).active,
"Board service room type was not archived",
)
self.assertFalse(
bsrt_line.active,
"Board service room type line was not archived",
)

# ACT — reactivate
board_service.with_context(active_test=False).active = True

# ASSERT — propagation back
self.assertTrue(bs_line.active, "Board service line was not reactivated")
self.assertTrue(bsrt.active, "Board service room type was not reactivated")
self.assertTrue(
bsrt_line.active,
"Board service room type line was not reactivated",
)
43 changes: 26 additions & 17 deletions pms/views/pms_board_service_room_type_views.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,32 @@
<field name="model">pms.board.service.room.type</field>
<field name="arch" type="xml">
<form string="Board Service Line">
<group>
<field name="amount" />
<field name="pms_property_id" />
<field name="board_service_line_ids">
<tree editable="bottom">
<field
name="pms_board_service_room_type_id"
invisible="1"
/>
<field name="product_id" />
<field name="amount" />
<field name="adults" />
<field name="children" />
<field name="pms_property_id" invisible="1" />
</tree>
</field>
</group>
<sheet>
<widget
name="web_ribbon"
title="Archived"
bg_color="bg-danger"
attrs="{'invisible': [('active', '=', True)]}"
/>
<field name="active" invisible="1" />
<group>
<field name="amount" />
<field name="pms_property_id" />
<field name="board_service_line_ids">
<tree editable="bottom">
<field
name="pms_board_service_room_type_id"
invisible="1"
/>
<field name="product_id" />
<field name="amount" />
<field name="adults" />
<field name="children" />
<field name="pms_property_id" invisible="1" />
</tree>
</field>
</group>
</sheet>
</form>
</field>
</record>
Expand Down
63 changes: 44 additions & 19 deletions pms/views/pms_board_service_views.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,35 @@
<field name="model">pms.board.service</field>
<field name="arch" type="xml">
<form string="Board Service Line">
<group>
<field name="name" />
<field name="default_code" />
<field
name="pms_property_ids"
widget="many2many_tags"
options="{'no_create': True,'no_open': True}"
<sheet>
<widget
name="web_ribbon"
title="Archived"
bg_color="bg-danger"
attrs="{'invisible': [('active', '=', True)]}"
/>
<field name="amount" />
<field name="board_service_line_ids">
<tree editable="bottom">
<field name="product_id" />
<field name="amount" />
<field name="adults" />
<field name="children" />
<field name="pms_property_ids" invisible="1" />
</tree>
</field>
<field name="show_detail_report" />
</group>
<field name="active" invisible="1" />
<group>
<field name="name" />
<field name="default_code" />
<field
name="pms_property_ids"
widget="many2many_tags"
options="{'no_create': True,'no_open': True}"
/>
<field name="amount" />
<field name="board_service_line_ids">
<tree editable="bottom">
<field name="product_id" />
<field name="amount" />
<field name="adults" />
<field name="children" />
<field name="pms_property_ids" invisible="1" />
</tree>
</field>
<field name="show_detail_report" />
</group>
</sheet>
</form>
</field>
</record>
Expand All @@ -41,10 +50,26 @@
</tree>
</field>
</record>
<record model="ir.ui.view" id="pms_board_service_view_search">
<field name="name">pms.board.service.search</field>
<field name="model">pms.board.service</field>
<field name="arch" type="xml">
<search string="Board Service">
<field name="name" />
<field name="default_code" />
<filter
name="inactive"
string="Archived"
domain="[('active', '=', False)]"
/>
</search>
</field>
</record>
<record model="ir.actions.act_window" id="open_pms_board_service_form_tree">
<field name="name">Board Services</field>
<field name="res_model">pms.board.service</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="pms_board_service_view_search" />
</record>
<menuitem
name="Board Services"
Expand Down
Loading