audrius/pms
1
0
Fork 1
mirror of https://github.com/OCA/pms.git synced 2025-01-29 00:17:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

[ADD]pms: avoid sale channel constrain if not channel set

Browse Source
This commit is contained in:
Darío Lodeiros
2022-07-23 16:12:03 +02:00
parent 0f83df5105
commit 9705e657c7
5 changed files with 96 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
pms/models/pms_reservation.py
View File

@@ -1892,7 +1892,7 @@ class PmsReservation(models.Model):
@api.constrains("sale_channel_ids")
def _check_lines_with_sale_channel_id(self):
for record in self:
for record in self.filtered("sale_channel_origin_id"):
if record.reservation_line_ids:
if record.sale_channel_origin_id not in record.sale_channel_ids:
raise ValidationError(
@@ -2041,36 +2041,15 @@ class PmsReservation(models.Model):
and "sale_channel_origin_id" in vals
and ("partner_name" in vals or "partner_id" in vals or "agency_id" in vals)
):
folio_vals = {
"pms_property_id": vals["pms_property_id"],
}
if vals.get("sale_channel_origin_id"):
folio_vals["sale_channel_origin_id"] = vals.get(
"sale_channel_origin_id"
)
if vals.get("partner_id"):
folio_vals["partner_id"] = vals.get("partner_id")
elif vals.get("agency_id"):
folio_vals["agency_id"] = vals.get("agency_id")
elif vals.get("partner_name"):
folio_vals["partner_name"] = vals.get("partner_name")
folio_vals["mobile"] = vals.get("mobile")
folio_vals["email"] = vals.get("email")
elif vals.get("reservation_type") != "out":
raise ValidationError(_("Partner contact name is required"))
folio_vals = self._get_folio_vals(vals)
self._check_clousure_reason(
reservation_type=vals.get("reservation_type"),
clousure_reason=vals.get("clousure_reason_id"),
)
# Create the folio in case of need
# (To allow to create reservations direct)
if vals.get("reservation_type"):
folio_vals["reservation_type"] = vals.get("reservation_type")
if vals.get("reservation_type") == "out" and not vals.get(
"closure_reason_id"
):
raise ValidationError(
_(
"A closure reason is mandatory when reservation"
" type is 'out of service'"
)
)
folio = self.env["pms.folio"].create(folio_vals)
vals.update(
{
@@ -2133,6 +2112,35 @@ class PmsReservation(models.Model):
self._check_capacity()
return res
def _get_folio_vals(self, reservation_vals):
folio_vals = {
"pms_property_id": reservation_vals["pms_property_id"],
}
if reservation_vals.get("sale_channel_origin_id"):
folio_vals["sale_channel_origin_id"] = reservation_vals.get(
"sale_channel_origin_id"
)
if reservation_vals.get("partner_id"):
folio_vals["partner_id"] = reservation_vals.get("partner_id")
elif reservation_vals.get("agency_id"):
folio_vals["agency_id"] = reservation_vals.get("agency_id")
elif reservation_vals.get("partner_name"):
folio_vals["partner_name"] = reservation_vals.get("partner_name")
folio_vals["mobile"] = reservation_vals.get("mobile")
folio_vals["email"] = reservation_vals.get("email")
elif reservation_vals.get("reservation_type") != "out":
raise ValidationError(_("Partner contact name is required"))
return folio_vals
def _check_clousure_reason(self, reservation_type, clousure_reason):
if reservation_type == "out" and not clousure_reason:
raise ValidationError(
_(
"A closure reason is mandatory when reservation"
" type is 'out of service'"
)
)
def _check_services(self, vals):
# If we create a reservation with board service and other service at the same time,
# compute_service_ids dont run (compute with readonly to False),

1
pms/models/pms_reservation_line.py
View File

@@ -119,6 +119,7 @@ class PmsReservationLine(models.Model):
comodel_name="pms.sale.channel",
check_pms_properties=True,
)
_sql_constraints = [
(
"rule_availability",