Fix allow_mail_archived_partner causing system notifications to send emails
This commit is contained in:
@@ -1,45 +1,59 @@
|
||||
@api.model
|
||||
def _search(self, args, offset=0, limit=None, order=None, count=False, access_rights_uid=None):
|
||||
"""
|
||||
Allow archived partners when context permits.
|
||||
"""
|
||||
_logger.debug("=== RES.PARTNER _search ===")
|
||||
_logger.debug(f"Search args before: {args}")
|
||||
import logging
|
||||
_logger = logging.getLogger(__name__)
|
||||
|
||||
# Check if we should include archived partners
|
||||
include_archived = (
|
||||
self.env.context.get("include_archived_partners") or
|
||||
self.env.context.get("mail_notify_force") or
|
||||
self.env.context.get("force_email") or
|
||||
self.env.context.get("mark_invoice_as_sent")
|
||||
)
|
||||
from odoo import models, api
|
||||
|
||||
if include_archived:
|
||||
_logger.debug("Context flags found - allowing archived partners")
|
||||
|
||||
# Remove both active and partner_share filters for archived partners
|
||||
filtered_args = []
|
||||
for arg in args:
|
||||
# Skip active=True/False filters
|
||||
if isinstance(arg, (list, tuple)) and len(arg) == 3:
|
||||
if arg[0] == "active":
|
||||
_logger.debug(f"Removing active filter: {arg}")
|
||||
continue
|
||||
# Also skip partner_share filter when looking for specific archived partners
|
||||
if arg[0] == "partner_share" and arg[1] == "=" and arg[2] is True:
|
||||
_logger.debug(f"Removing partner_share filter: {arg}")
|
||||
continue
|
||||
class ResPartner(models.Model):
|
||||
_inherit = "res.partner"
|
||||
|
||||
filtered_args.append(arg)
|
||||
@api.model
|
||||
def _search(self, args, offset=0, limit=None, order=None, count=False, access_rights_uid=None):
|
||||
"""
|
||||
Allow archived partners when context permits.
|
||||
"""
|
||||
_logger.debug("=== RES.PARTNER _search ===")
|
||||
_logger.debug(f"Search args before: {args}")
|
||||
_logger.debug(f"Context include_archived: {self.env.context.get('include_archived_partners')}")
|
||||
_logger.debug(f"Context mail_notify_force: {self.env.context.get('mail_notify_force')}")
|
||||
_logger.debug(f"Context force_email: {self.env.context.get('force_email')}")
|
||||
|
||||
args = filtered_args
|
||||
self = self.with_context(active_test=False)
|
||||
_logger.debug(f"Search args after: {args}")
|
||||
# Check if we should include archived partners
|
||||
include_archived = (
|
||||
self.env.context.get("include_archived_partners") or
|
||||
self.env.context.get("mail_notify_force") or
|
||||
self.env.context.get("force_email") or
|
||||
self.env.context.get("mark_invoice_as_sent")
|
||||
)
|
||||
|
||||
result = super()._search(args, offset, limit, order, count, access_rights_uid)
|
||||
if include_archived:
|
||||
_logger.debug("Context flags found - allowing archived partners")
|
||||
|
||||
if not count:
|
||||
result_ids = list(result)
|
||||
_logger.debug(f"Search returned {len(result_ids)} results")
|
||||
# Remove both active and partner_share filters
|
||||
filtered_args = []
|
||||
for arg in args:
|
||||
if isinstance(arg, (list, tuple)) and len(arg) == 3:
|
||||
# Skip active filters
|
||||
if arg[0] == "active":
|
||||
_logger.debug(f"Removing active filter: {arg}")
|
||||
continue
|
||||
# Skip partner_share filter for manual sends to archived partners
|
||||
if arg[0] == "partner_share" and arg[1] == "=" and arg[2] is True:
|
||||
_logger.debug(f"Removing partner_share filter: {arg}")
|
||||
continue
|
||||
|
||||
return result
|
||||
filtered_args.append(arg)
|
||||
|
||||
args = filtered_args
|
||||
self = self.with_context(active_test=False)
|
||||
_logger.debug(f"Search args after: {args}")
|
||||
|
||||
result = super()._search(args, offset, limit, order, count, access_rights_uid)
|
||||
|
||||
if not count:
|
||||
result_ids = list(result)
|
||||
_logger.debug(f"Search returned {len(result_ids)} results")
|
||||
if result_ids:
|
||||
_logger.debug(f"First result IDs: {result_ids[:5]}")
|
||||
|
||||
return result
|
||||
Reference in New Issue
Block a user