diff --git a/pms/models/pms_folio.py b/pms/models/pms_folio.py index b06e1a91a..814ae261b 100644 --- a/pms/models/pms_folio.py +++ b/pms/models/pms_folio.py @@ -1103,7 +1103,14 @@ class PmsFolio(models.Model): @api.depends("partner_id", "partner_id.name", "agency_id", "reservation_type") def _compute_partner_name(self): for record in self: - self._apply_partner_name(record) + if record.partner_id and record.partner_id != record.agency_id: + record.partner_name = record.partner_id.name + elif record.agency_id and not record.partner_name: + # if the customer not is the agency but we dont know the customer's name, + # set the name provisional + record.partner_name = _("Reservation from ") + record.agency_id.name + elif not record.partner_name: + record.partner_name = False @api.depends("partner_id", "partner_id.email", "agency_id") def _compute_email(self): @@ -2581,17 +2588,6 @@ class PmsFolio(models.Model): final_discount = 100.0 - (discount_factor * 100.0) return final_discount - @api.model - def _apply_partner_name(self, record): - if record.partner_id and record.partner_id != record.agency_id: - record.partner_name = record.partner_id.name - elif record.agency_id and not record.partner_name: - # if the customer not is the agency but we dont know the customer's name, - # set the name provisional - record.partner_name = _("Reservation from ") + record.agency_id.name - elif not record.partner_name: - record.partner_name = False - @api.model def _apply_mobile(self, record): if record.partner_id and not record.mobile: diff --git a/pms/models/pms_reservation.py b/pms/models/pms_reservation.py index 72bb917c1..8f5303868 100644 --- a/pms/models/pms_reservation.py +++ b/pms/models/pms_reservation.py @@ -1461,10 +1461,16 @@ class PmsReservation(models.Model): ) def _compute_partner_name(self): for record in self: - if record.reservation_type != "out": - self.env["pms.folio"]._apply_partner_name(record) - else: - record.partner_name = record.out_service_description + if record.partner_id and record.partner_id != record.agency_id: + record.partner_name = record.partner_id.name + if record.folio_id and not record.partner_name: + record.partner_name = record.folio_id.partner_name + elif record.agency_id and not record.partner_name: + # if the customer not is the agency but we dont know the customer's name, + # set the name provisional + record.partner_name = _("Reservation from ") + record.agency_id.name + elif not record.partner_name: + record.partner_name = False @api.depends("partner_id", "partner_id.email", "agency_id") def _compute_email(self):