From 5296bd3b24e57811ed3530504046972e348eae0c Mon Sep 17 00:00:00 2001
From: Daniel Gergely <dgergely@compassion.ch>
Date: Mon, 23 Mar 2026 11:19:47 +0100
Subject: [PATCH 1/2] [T3064] FIX: interaction resume now contains contactus
 form submissions

- FIX: search for crm claims even if no partner is added. use the email address to match to partner.
---
 interaction_resume/models/crm_request.py | 52 +++++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/interaction_resume/models/crm_request.py b/interaction_resume/models/crm_request.py
index 165f7eba8..78f04092b 100644
--- a/interaction_resume/models/crm_request.py
+++ b/interaction_resume/models/crm_request.py
@@ -19,6 +19,24 @@ def _get_interaction_data(self, partner_id):
             | partner.other_contact_ids
         )
         for claim in self:
+            # Contactus form if applicable
+            res.append(
+                {
+                    "partner_id": partner_id,
+                    "res_model": self._name,
+                    "res_id": claim.id,
+                    "direction": "in",
+                    "date": claim.date or claim.create_date,
+                    "email": claim.email_from or claim.partner_id.email,
+                    "communication_type": "Support",
+                    "subject": "CRM Request: " + str(claim.name),
+                    "body": html2plaintext(claim.description).replace("\n\n", "\n"),
+                    "has_attachment": False,
+                    "tracking_status": False,
+                }
+            )
+
+            # Other messages
             messages = claim.message_ids.filtered(
                 lambda m: (m.partner_ids & partners) or m.author_id in partners
             ).filtered("subject")
@@ -59,10 +77,42 @@ def _get_interaction_partner_domain(self, partner):
             ("email_from", "=", partner.email),
         ]
 
+    @api.model_create_multi
+    def create(self, vals_list):
+        """
+        Override create to trigger timeline update for anonymous users by email
+        """
+        claims = super().create(vals_list)
+        for claim in claims:
+            partner_to_update = claim.partner_id
+            # If no partner_id, try to find a partner using email
+            if not partner_to_update and claim.email_from:
+                partner_to_update = self.env["res.partner"].search(
+                    [("email", "=", claim.email_from)], limit=1
+                )
+
+            if partner_to_update:
+                partner_to_update.with_delay(
+                    channel="root.partner_communication",
+                    priority=100,
+                    identity_key=partner_to_update._name
+                    + ".fetch_interactions."
+                    + str(partner_to_update.id),
+                ).fetch_interactions()
+        return claims
+
     @api.returns("mail.message", lambda value: value.id)
     def message_post(self, **kwargs):
         res = super().message_post(**kwargs)
-        if self.partner_id:
+
+        partner_to_update = self.partner_id
+        # If no partner_id, try to find a partner using email
+        if not partner_to_update:
+            partner_to_update = self.env["res.partner"].search(
+                "email", "=", self.email_from, limit=1
+            )
+
+        if partner_to_update:
             self.partner_id.with_delay(
                 channel="root.partner_communication",
                 priority=100,

From 3680d291d2d1537c316b8bbd60587acdf36efed1 Mon Sep 17 00:00:00 2001
From: Daniel Gergely <dgergely@compassion.ch>
Date: Mon, 23 Mar 2026 11:32:40 +0100
Subject: [PATCH 2/2] [T3064] FIX: GCA suggestion

---
 interaction_resume/models/crm_request.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/interaction_resume/models/crm_request.py b/interaction_resume/models/crm_request.py
index 78f04092b..241ab980c 100644
--- a/interaction_resume/models/crm_request.py
+++ b/interaction_resume/models/crm_request.py
@@ -40,6 +40,8 @@ def _get_interaction_data(self, partner_id):
             messages = claim.message_ids.filtered(
                 lambda m: (m.partner_ids & partners) or m.author_id in partners
             ).filtered("subject")
+            if claim.incoming_message_id in messages:
+                messages -= claim.incoming_message_id
             res.extend(
                 [
                     {