From eba3a59295a68953c6a630dec902b3ed6db8d131 Mon Sep 17 00:00:00 2001
From: Kristof Bernaert <kristof@vanbernaert.eu>
Date: Mon, 26 Jan 2026 03:18:56 +0100
Subject: [PATCH] Fix allow_mail_archived_partner causing system notifications
 to send emails

---
 .../models/account_move_send.py               | 73 +++++++++++++++----
 1 file changed, 58 insertions(+), 15 deletions(-)

diff --git a/allow_mail_archived_partner/models/account_move_send.py b/allow_mail_archived_partner/models/account_move_send.py
index 40c3c0f..c5aff46 100755
--- a/allow_mail_archived_partner/models/account_move_send.py
+++ b/allow_mail_archived_partner/models/account_move_send.py
@@ -1,23 +1,66 @@
-from odoo import models, api
+import logging
+_logger = logging.getLogger(__name__)
+
+from odoo import models, api, fields
 
 
 class AccountInvoiceSend(models.TransientModel):
     _inherit = "account.invoice.send"
 
-    @api.model
-    def _get_default_mail_partner_ids(self, move, mail_template, mail_lang):
-        """
-        Allow archived partners to be included as recipients when
-        sending invoices via the 'Send by Email' wizard.
-        This is the ONLY place where partner_ids are computed.
-        """
-        # Temporarily disable active_test so archived partners are not filtered out
-        wiz = self.with_context(
-            active_test=False,
-            include_archived_partners=True,
-        )
 
+    @api.model
+    def default_get(self, fields):
+        _logger.info("=== ACCOUNT.INVOICE.SEND DEFAULT_GET ===")
+        
+        res = super().default_get(fields)
+        
+        active_ids = self.env.context.get('active_ids', [])
+        
+        if active_ids:
+            moves = self.env['account.move'].with_context(
+                active_test=False
+            ).browse(active_ids)
+            
+            partner_ids = []
+            for move in moves:
+                if move.partner_id:
+                    partner_ids.append(move.partner_id.id)
+            
+            if partner_ids:
+                res['partner_ids'] = [(6, 0, partner_ids)]
+                _logger.info(f"SET partner_ids: {res['partner_ids']}")
+        
+        return res
+
+    def action_send_and_print(self):
+        _logger.info("=== ACCOUNT.INVOICE.SEND action_send_and_print ===")
+        _logger.info(f"Wizard ID: {self.id}, Partners: {self.partner_ids.ids}")
+        
         return super(
             AccountInvoiceSend,
-            wiz
-        )._get_default_mail_partner_ids(move, mail_template, mail_lang)
+            self.with_context(
+                active_test=False,
+                include_archived_partners=True,
+                mail_notify_force=True,
+                force_email=True,
+                mark_invoice_as_sent=True,
+            )
+        ).action_send_and_print()
+
+    # LOG ALL POSSIBLE ACTIONS
+    def action_send(self):
+        _logger.info("=== ACCOUNT.INVOICE.SEND action_send ===")
+        return super().action_send()
+
+    def send_and_print_action(self):
+        _logger.info("=== ACCOUNT.INVOICE.SEND send_and_print_action ===")
+        return super().send_and_print_action()
+
+    def print_action(self):
+        _logger.info("=== ACCOUNT.INVOICE.SEND print_action ===")
+        return super().print_action()
+
+    @api.model
+    def action_send_and_print_invoices(self, invoices):
+        _logger.info("=== ACCOUNT.INVOICE.SEND action_send_and_print_invoices ===")
+        return super().action_send_and_print_invoices(invoices)
\ No newline at end of file