From 4f5447b83bf6b09289436173da651ecc67ad49bb Mon Sep 17 00:00:00 2001 From: braisab Date: Wed, 20 Oct 2021 23:24:20 +0200 Subject: [PATCH] [FIX]pms: fixed sending of email from the reservation model --- pms/models/mail_compose_message.py | 6 ++++-- pms/models/pms_reservation.py | 24 +++++++++++------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pms/models/mail_compose_message.py b/pms/models/mail_compose_message.py index e76de0ec6..0e74c8757 100644 --- a/pms/models/mail_compose_message.py +++ b/pms/models/mail_compose_message.py @@ -36,8 +36,10 @@ class MailComposeMessage(models.TransientModel): # folio.reservation_ids = cmds res = super(MailComposeMessage, self).send_mail(auto_commit=auto_commit) if self._context.get("record_id"): - reservation = self.env["pms.reservation"].search( + folio = self.env["pms.folio"].search( [("id", "=", self._context.get("record_id"))] ) - reservation.is_mail_send = True + reservations = folio.reservation_ids + for reservation in reservations: + reservation.is_mail_send = True return res diff --git a/pms/models/pms_reservation.py b/pms/models/pms_reservation.py index b4132fcfd..a215ecf82 100644 --- a/pms/models/pms_reservation.py +++ b/pms/models/pms_reservation.py @@ -1727,38 +1727,36 @@ class PmsReservation(models.Model): def action_open_mail_composer(self): self.ensure_one() template = False + pms_property = self.pms_property_id if ( not self.is_mail_send and not self.is_modified_reservation and self.state not in "cancel" ): - template = self.env.ref( - "pms.confirmed_reservation_email", raise_if_not_found=False - ) + if pms_property.property_confirmed_template: + template = pms_property.property_confirmed_template elif ( not self.is_mail_send and self.is_modified_reservation and self.state not in "cancel" ): - template = self.env.ref( - "pms.modified_reservation_email", raise_if_not_found=False - ) + if pms_property.property_modified_template: + template = pms_property.property_modified_template elif not self.is_mail_send and self.state in "cancel": - template = self.env.ref( - "pms.cancelled_reservation_email", raise_if_not_found=False - ) + if pms_property.property_canceled_template: + template = pms_property.property_canceled_template compose_form = self.env.ref( "mail.email_compose_message_wizard_form", raise_if_not_found=False ) ctx = dict( - model="pms.reservation", - default_res_model="pms.reservation", - default_res_id=self.id, + model="pms.folio", + default_res_model="pms.folio", + default_res_id=self.folio_id.id, template_id=template and template.id or False, composition_mode="comment", partner_ids=[self.partner_id.id], force_email=True, - record_id=self.id, + record_id=self.folio_id.id, ) return { "name": _("Send Confirmed Reservation Mail "),