From 660d506c0e8da6ad10df4cbbce715ce113b9de5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dar=C3=ADo=20Lodeiros?= Date: Sun, 3 Apr 2022 22:13:51 +0200 Subject: [PATCH] [IMP]pms: avoid payment notifications without email from --- pms/models/pms_folio.py | 73 ++++++++++++++++++++++++----------------- 1 file changed, 42 insertions(+), 31 deletions(-) diff --git a/pms/models/pms_folio.py b/pms/models/pms_folio.py index 9a81d6afb..f50c2c187 100644 --- a/pms/models/pms_folio.py +++ b/pms/models/pms_folio.py @@ -1848,6 +1848,8 @@ class PmsFolio(models.Model): "origin": folio, }, subtype_id=self.env.ref("mail.mt_note").id, + email_from=user.partner_id.email_formatted + or folio.pms_property_id.email_formatted, ) pay.action_post() @@ -1871,22 +1873,25 @@ class PmsFolio(models.Model): date=date, ) self.env["account.bank.statement.line"].sudo().create(line) - - # folio.message_post( - # body=_( - # """Payment: %s by %s""", - # amount, - # journal.display_name, - # ) - # ) - # for reservation in folio.reservation_ids: - # reservation.message_post( - # body=_( - # """Payment: %s by %s""", - # amount, - # journal.display_name, - # ) - # ) + folio.message_post( + body=_( + """Payment: %s by %s""", + amount, + journal.display_name, + ), + email_from=user.partner_id.email_formatted + or folio.pms_property_id.email_formatted, + ) + for reservation in folio.reservation_ids: + reservation.message_post( + body=_( + """Payment: %s by %s""", + amount, + journal.display_name, + ), + email_from=user.partner_id.email_formatted + or folio.pms_property_id.email_formatted, + ) return True def do_refund( @@ -1931,6 +1936,8 @@ class PmsFolio(models.Model): "origin": folio, }, subtype_id=self.env.ref("mail.mt_note").id, + email_from=user.partner_id.email_formatted + or folio.pms_property_id.email_formatted, ) pay.action_post() @@ -1949,21 +1956,25 @@ class PmsFolio(models.Model): ) self.env["account.bank.statement.line"].sudo().create(line) - # folio.message_post( - # body=_( - # """Refund: %s by %s""", - # amount, - # journal.display_name, - # ) - # ) - # for reservation in folio.reservation_ids: - # reservation.message_post( - # body=_( - # """Refund: %s by %s""", - # amount, - # journal.display_name, - # ) - # ) + folio.message_post( + body=_( + """Refund: %s by %s""", + amount, + journal.display_name, + ), + email_from=user.partner_id.email_formatted + or folio.pms_property_id.email_formatted, + ) + for reservation in folio.reservation_ids: + reservation.message_post( + body=_( + """Refund: %s by %s""", + amount, + journal.display_name, + ), + email_from=user.partner_id.email_formatted + or folio.pms_property_id.email_formatted, + ) return True def open_wizard_several_partners(self):