Fix allow_mail_archived_partner causing system notifications to send emails

This commit is contained in:
Kristof Bernaert
2026-01-26 02:25:11 +01:00
parent 38f3ca8774
commit aad8686248
2 changed files with 74 additions and 63 deletions
@@ -12,13 +12,40 @@ class MailThread(models.AbstractModel):
def _notify_get_recipients(self, message, msg_vals, **kwargs):
"""
FIXED: Allow archived partners ONLY for explicit manual sends
Allow archived partners ONLY for explicit manual sends
"""
# 1) BLOCK system notifications completely
# 1) Check if this is a MANUAL send (from invoice wizard or compose message)
is_manual_send = (
self.env.context.get("mail_notify_force") or
self.env.context.get("include_archived_partners") or
self.env.context.get("force_email") or # From invoice wizard
self.env.context.get("mark_invoice_as_sent") # From invoice wizard
)
_logger.debug(f"MailThread._notify_get_recipients for {self._name}")
_logger.debug(f"Is manual send: {is_manual_send}")
_logger.debug(f"Context: mail_notify_force={self.env.context.get('mail_notify_force')}, "
f"include_archived={self.env.context.get('include_archived_partners')}, "
f"force_email={self.env.context.get('force_email')}")
# 2) For MANUAL sends, allow archived partners with full context
if is_manual_send:
_logger.debug(f"Manual send detected for {self._name}, allowing archived partners")
return super(
MailThread,
self.with_context(
active_test=False,
include_archived_partners=True,
mail_notify_force=True,
)
)._notify_get_recipients(message, msg_vals, **kwargs)
# 3) BLOCK system notifications completely
is_system_notification = (
getattr(message, "message_type", None) == "notification" or
getattr(message, "author_id", False) and
message.author_id == self.env.ref("base.partner_root", raise_if_not_found=False)
message.author_id == self.env.ref("base.partner_root", raise_if_not_found=False) or
(msg_vals and msg_vals.get("message_type") == "notification")
)
if is_system_notification:
@@ -28,20 +55,6 @@ class MailThread(models.AbstractModel):
for recipient in recipients:
recipient["notif"] = "inbox"
return recipients
# 2) Check if this is an EXPLICIT manual send
is_explicit_send = (
self.env.context.get("mail_notify_force") or
self.env.context.get("include_archived_partners")
)
# 3) For explicit sends, allow archived partners
if is_explicit_send:
_logger.debug(f"Explicit send detected for {self._name}, allowing archived partners")
return super(
MailThread,
self.with_context(active_test=False)
)._notify_get_recipients(message, msg_vals, **kwargs)
# 4) Default behavior for non-explicit sends
# 4) Default behavior for non-manual, non-system sends
return super()._notify_get_recipients(message, msg_vals, **kwargs)