[14.0][MIG] mail_company_aware_sender: Backport to 14.0

Author: ntsirintanis

mail_company_aware_sender/__manifest__.py

@@ -4,7 +4,7 @@
 {
     "name": "Mail Sender Company Aware",
     "summary": "Send emails with company specific mail domain",
-    "version": "16.0.1.0.0",
+    "version": "14.0.1.0.0",
     "category": "Social Network",
     "website": "https://github.com/OCA/social",
     "author": ("Therp BV, " "Odoo Community Association (OCA)"),

mail_company_aware_sender/models/ir_mail_server.py

@@ -21,18 +21,18 @@ def _is_domain_whitelisted(self, domain):
 
     def _get_test_email_addresses(self):
         self.ensure_one()
-        if self.from_filter or not self.env.user.email:
-            return super()._get_test_email_addresses()
         email_to = "noreply@odoo.com"
+        # if server forces a sender, use it.
+        if self.smtp_from:
+            return self.smtp_from, email_to
+        if not self.env.user.email:
+            return super()._get_test_email_addresses()
         email_from = self.env.user.company_aware_email()
         email_domain = email_domain_extract(email_from)
         valid_domains = self._get_domain_whitelist(self.domain_whitelist)
         if email_domain not in valid_domains:
             raise ValidationError(
-                _(
-                    "Domain %s not whitelisted on this server",
-                    email_domain,
-                )
+                _("Domain %s not whitelisted on this server") % email_domain
             )
         return email_from, email_to
 

mail_company_aware_sender/models/mail_thread.py

@@ -6,7 +6,7 @@
 class MailThread(models.AbstractModel):
     _inherit = "mail.thread"
 
-    def _message_compute_author(self, author_id, email_from, raise_on_email=True):
+    def _message_compute_author(self, author_id, email_from, raise_exception=True):
         """Set email from using company email domain.
 
         We will NOT override an explicitly passed email_from.
@@ -16,7 +16,7 @@ def _message_compute_author(self, author_id, email_from, raise_on_email=True):
         """
         email_passed = bool(email_from)
         author_id, email_from = super()._message_compute_author(
-            author_id, email_from, raise_on_email=raise_on_email
+            author_id, email_from, raise_exception=raise_exception
         )
         if (not email_passed) and author_id:
             author = self.env["res.partner"].browse(author_id)

mail_company_aware_sender/tests/common.py

@@ -1,10 +1,9 @@
 # Copyright 2025 Therp BV <https://therp.nl>.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-from odoo import Command
-from odoo.tests import TransactionCase
+from odoo.tests.common import SavepointCase
 
 
-class CompanyAwareSenderCase(TransactionCase):
+class CompanyAwareSenderCase(SavepointCase):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
@@ -47,7 +46,7 @@ def setUpClass(cls):
                 "email": "charlemagne@therp.nl",
                 "company_id": cls.company_kingdom.id,
                 "company_ids": [
-                    Command.set([cls.company_kingdom.id, cls.company_imperium.id]),
+                    (6, 0, [cls.company_kingdom.id, cls.company_imperium.id]),
                 ],
             }
         )

mail_company_aware_sender/tests/test_company_aware_sender.py

@@ -1,9 +1,18 @@
 # Copyright 2025 Therp BV <https://therp.nl>.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from email.utils import parseaddr
+
 from .common import CompanyAwareSenderCase
 
 
 class TestCompanyAwareSender(CompanyAwareSenderCase):
+    def _assert_email(self, email_from, expected_email, expected_name=None):
+        """Assert email_from matches expected parts, tolerant to quoting differences."""
+        name, email = parseaddr(email_from or "")
+        self.assertEqual(email, expected_email)
+        if expected_name is not None:
+            self.assertEqual(name, expected_name)
+
     def test_nothing_changed(self):
         # Check with default user and author (current user).
         mail_thread = (
@@ -13,12 +22,12 @@ def test_nothing_changed(self):
         )
         author_id, email_from = mail_thread._message_compute_author(None, None)
         self.assertEqual(author_id, self.partner_charles.id)
-        self.assertEqual(email_from, '"Charles Le Magne" <charlemagne@therp.nl>')
+        self._assert_email(email_from, "charlemagne@therp.nl", "Charles Le Magne")
         author_id, email_from = mail_thread._message_compute_author(
             None, '"Unknown Person" <unknown.person@example.com>'
         )
         self.assertEqual(author_id, False)
-        self.assertEqual(email_from, '"Unknown Person" <unknown.person@example.com>')
+        self._assert_email(email_from, "unknown.person@example.com", "Unknown Person")
 
     def test_company_overwrite(self):
         # Check with default user and author (current user).
@@ -30,25 +39,25 @@ def test_company_overwrite(self):
         # Should not work if domain not whitelisted.
         author_id, email_from = mail_thread._message_compute_author(None, None)
         self.assertEqual(author_id, self.partner_charles.id)
-        self.assertEqual(email_from, '"Charles Le Magne" <charlemagne@therp.nl>')
+        self._assert_email(email_from, "charlemagne@therp.nl", "Charles Le Magne")
         # Whitelist domain.
         self.mail_server.write(
             {"domain_whitelist": "therp.nl,kingdom.fr,imperiumromanum.org"}
         )
         author_id, email_from = mail_thread._message_compute_author(None, None)
         self.assertEqual(author_id, self.partner_charles.id)
-        self.assertEqual(email_from, "charlemagne@imperiumromanum.org")
+        self._assert_email(email_from, "charlemagne@imperiumromanum.org")
         self.company_imperium.write({"format_email": True})
         author_id, email_from = mail_thread._message_compute_author(None, None)
         self.assertEqual(author_id, self.partner_charles.id)
-        self.assertEqual(
-            email_from, '"Charles Le Magne" <charlemagne@imperiumromanum.org>'
+        self._assert_email(
+            email_from, "charlemagne@imperiumromanum.org", "Charles Le Magne"
         )
         # Now opt out for the override.
         self.partner_charles.write({"fixed_email": True})
         author_id, email_from = mail_thread._message_compute_author(None, None)
         self.assertEqual(author_id, self.partner_charles.id)
-        self.assertEqual(email_from, '"Charles Le Magne" <charlemagne@therp.nl>')
+        self._assert_email(email_from, "charlemagne@therp.nl", "Charles Le Magne")
 
     def test_get_sender_from_object(self):
         # Whitelist domain.
@@ -60,4 +69,4 @@ def test_get_sender_from_object(self):
         himiltrude = self.partner_himiltrude.sudo().with_company(main_company)
         # Make sure user and company from object used.
         email_from = self.env.user.sudo().get_company_aware_email(himiltrude)
-        self.assertEqual(email_from, "charlemagne@imperiumromanum.org")
+        self._assert_email(email_from, "charlemagne@imperiumromanum.org")

mail_company_aware_sender/tests/test_mail_server.py

@@ -1,37 +1,46 @@
 # Copyright 2025 Therp BV <https://therp.nl>.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from email.utils import parseaddr
+
 from odoo.exceptions import ValidationError
 
 from .common import CompanyAwareSenderCase
 
 
 class TestMailServer(CompanyAwareSenderCase):
+    def _assert_email(self, email_from, expected_email, expected_name=None):
+        """Assert email_from matches expected parts, tolerant to quoting differences."""
+        name, email = parseaddr(email_from or "")
+        self.assertEqual(email, expected_email)
+        if expected_name is not None:
+            self.assertEqual(name, expected_name)
+
     def test_test_email_adresses(self):
         # Whitelist domain, and enable from address.
         self.mail_server.write(
             {
-                "from_filter": "info@therp.nl",
+                "smtp_from": "info@therp.nl",
                 "domain_whitelist": "therp.nl,kingdom.fr,imperiumromanum.org",
             }
         )
         email_from, email_to = self.mail_server._get_test_email_addresses()
         self.assertEqual(email_from, "info@therp.nl")
         self.assertEqual(email_to, "noreply@odoo.com")
-        # Disable from_filter and remove therp.nl from whitelist.
+        # Disable smtp_from and remove therp.nl from whitelist.
         self.mail_server.write(
             {
-                "from_filter": "info@therp.nl",
+                "smtp_from": "info@therp.nl",
                 "domain_whitelist": "kingdom.fr,imperiumromanum.org",
             }
         )
-        self.mail_server.write({"from_filter": False})
+        self.mail_server.write({"smtp_from": False})
         # Partner charles in imperium should use company aware from.
         email_from, email_to = (
             self.mail_server.with_user(self.user_charles)
             .with_company(self.company_imperium)
             ._get_test_email_addresses()
         )
-        self.assertEqual(email_from, "charlemagne@imperiumromanum.org")
+        self._assert_email(email_from, "charlemagne@imperiumromanum.org")
         self.assertEqual(email_to, "noreply@odoo.com")
         # There should be an exception when using an invalid email domain.
         self.company_imperium.write({"email": "court@aachen.de"})