Skip to content

Refact use of reservation_type to allow inherit conditions #364

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

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

Refact use of reservation_type to allow inherit conditions #364

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
52 changes: 47 additions & 5 deletions pms/models/pms_folio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@ def _compute_number_of_services(self):
def _compute_sale_line_ids(self):
for folio in self.filtered(lambda f: isinstance(f.id, int)):
sale_lines_vals = []
if folio.reservation_type in ("normal", "staff"):
if folio.reservation_type in self._get_reservation_types_with_any_pricing():
sale_lines_vals_to_drop = []
seq = 0
for reservation in sorted(
Expand All @@ -802,7 +802,11 @@ def _compute_sale_line_ids(self):
# RESERVATION LINES
reservation_sale_lines = []
reservation_sale_lines_to_drop = []
if reservation.reservation_line_ids:
if (
reservation.reservation_line_ids
and folio.reservation_type
in self._get_reservation_types_with_night_pricing()
):
(
reservation_sale_lines,
reservation_sale_lines_to_drop,
Expand All @@ -817,7 +821,11 @@ def _compute_sale_line_ids(self):
# RESERVATION SERVICES
service_sale_lines = []
service_sale_lines_to_drop = []
if reservation.service_ids:
if (
reservation.service_ids
and folio.reservation_type
in self._get_reservation_types_with_service_pricing()
):
(
service_sale_lines,
service_sale_lines_to_drop,
Expand Down Expand Up @@ -861,7 +869,10 @@ def _compute_company_id(self):
def _compute_pricelist_id(self):
for folio in self:
is_new = not folio.pricelist_id or isinstance(folio.id, models.NewId)
if folio.reservation_type == "out":
if (
folio.reservation_type
not in self._get_reservation_types_with_any_pricing()
):
folio.pricelist_id = False
elif len(folio.reservation_ids.pricelist_id) == 1:
folio.pricelist_id = folio.reservation_ids.pricelist_id
Expand Down Expand Up @@ -1224,7 +1235,10 @@ def _compute_untaxed_amount_to_invoice(self):
)
def _compute_amount(self):
for record in self:
if record.reservation_type == "out":
if (
record.reservation_type
not in self._get_reservation_types_with_any_pricing()
):
record.amount_total = 0
vals = {
"payment_state": "nothing_to_pay",
Expand Down Expand Up @@ -2765,3 +2779,31 @@ def _get_portal_return_action(self):
when returning from customer portal."""
self.ensure_one()
return self.env.ref("pms.open_pms_folio1_form_tree_all")

def _get_reservation_types_with_night_pricing(self):
"""
Returns reservation types that use night-based pricing
(e.g. per-night room price).
This method is meant to be extended by other modules.
"""
return ("normal",)

def _get_reservation_types_with_service_pricing(self):
"""
Returns reservation types that use the standard service pricing logic
(e.g. pms.service._get_price_unit_line).
This method is meant to be extended by other modules.
"""
return ("normal", "staff")

def _get_reservation_types_with_any_pricing(self):
"""
Returns reservation types that have any pricing rule.
(union of night-based and service-based types)
"""
night = list(self._get_reservation_types_with_night_pricing())
service = list(self._get_reservation_types_with_service_pricing())

# Combine preserving order: night first, then service without duplicates
result = night + [t for t in service if t not in night]
return tuple(result)
6 changes: 5 additions & 1 deletion pms/models/pms_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,11 @@ def _service_day_qty(self):

def _get_price_unit_line(self, date=False):
self.ensure_one()
if self.reservation_id.reservation_type in ("normal", "staff"):
Folio = self.env["pms.folio"]
if (
self.reservation_id.reservation_type
in Folio._get_reservation_types_with_service_pricing()
):
folio = self.folio_id
reservation = self.reservation_id
origin = reservation if reservation else folio
Expand Down
36 changes: 25 additions & 11 deletions pms/tests/test_pms_folio_sale_line.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1217,18 +1217,20 @@ def test_comp_fsl_fol_extra_services_two(self):

def test_no_sale_lines_staff_reservation(self):
"""
Check that the sale_line_ids of a folio whose reservation
is of type 'staff' are created with price 0.
Check that the folio sale lines linked to a staff reservation
are not created.

-----
A reservation is created with the reservation_type field
with value 'staff'. Then it is verified that the
sale_line_ids of the folio created with the creation of
the reservation have price 0.
set to 'staff'. Then it is verified that the folio created
together with the reservation has no sale lines linked to
the reservation lines.
"""
# ARRANGE
self.partner1 = self.env["res.partner"].create({"name": "Alberto"})
checkin = fields.date.today()
checkout = fields.date.today() + datetime.timedelta(days=1)
checkin = fields.Date.today()
checkout = fields.Date.today() + datetime.timedelta(days=1)

# ACT
reservation = self.env["pms.reservation"].create(
{
Expand All @@ -1243,11 +1245,23 @@ def test_no_sale_lines_staff_reservation(self):
"adults": 1,
}
)

# Sale lines of this folio that are linked to any reservation line
# of this reservation. Adjust the field name if it is
# reservation_line_id instead of reservation_line_ids.
sale_lines_linked = reservation.folio_id.sale_line_ids.filtered(
lambda line: line.reservation_line_ids
and any(
rl in reservation.reservation_line_ids
for rl in line.reservation_line_ids
)
)

# ASSERT
self.assertEqual(
reservation.folio_id.sale_line_ids.mapped("price_unit")[0],
0,
"Staff folio sale lines should have price 0",
self.assertFalse(
sale_lines_linked,
"Staff reservations should not create folio sale lines linked "
"to reservation lines.",
)

def test_no_sale_lines_out_reservation(self):
Expand Down
6 changes: 3 additions & 3 deletions pms/views/pms_folio_views.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@
<field name="pms_property_id" />
<field
name="pricelist_id"
attrs="{'invisible': [('reservation_type', 'not in', 'normal')]}"
attrs="{'invisible': [('reservation_type', '=', 'out')]}"
/>
<field name="company_id" options="{'no_create': True}" />
<field
Expand All @@ -340,7 +340,7 @@
/>
<field
name="agency_id"
attrs="{'invisible': [('reservation_type', 'not in', 'normal')]}"
attrs="{'invisible': [('reservation_type', '=', 'out')]}"
/>
<field name="sale_channel_origin_id" />
<field
Expand All @@ -367,7 +367,7 @@
<notebook colspan="4" col="1">
<page
string="Sale Lines"
attrs="{'invisible':[('reservation_type', '!=', 'normal')]}"
attrs="{'invisible':[('reservation_type', '=', 'out')]}"
>
<field
name="sale_line_ids"
Expand Down
4 changes: 2 additions & 2 deletions pms/views/pms_reservation_views.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@
<field
name="pricelist_id"
options="{'no_open':True,'no_create': True}"
attrs="{'invisible': [('reservation_type', '!=', 'normal')]}"
attrs="{'invisible': [('reservation_type', '=', 'out')]}"
/>
<!--<field
name="agency_id"
Expand Down Expand Up @@ -462,7 +462,7 @@
/>
<field
name="agency_id"
attrs="{'invisible': [('reservation_type', '!=', 'normal')]}"
attrs="{'invisible': [('reservation_type', '=', 'out')]}"
/>
<field name="sale_channel_origin_id" />
<field
Expand Down
Loading