vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #36994 from s-aga-r/19370

Browse source
This commit is contained in:
Suraj Shetty 2026-02-25 17:24:20 +05:30 • committed by GitHub
commit bb904fa60c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/core/doctype/communication/communication.py
View file

@ -419,7 +419,7 @@ class Communication(Document, CommunicationEmailMixin):
# Skip timeline links if a "Sent" communication already exists # Skip timeline links if a "Sent" communication already exists
# else will create duplicate timeline entries # else will create duplicate timeline entries
if self.sent_or_received == "Received" and self.find_one_by_filters( if self.sent_or_received == "Received" and self.find_one_by_filters(
message_id=self.message_id, sent_or_received="Sent" message_id=self.message_id, email_account=self.email_account, sent_or_received="Sent"
): ):
return return

6
frappe/email/doctype/email_account/test_email_account.py
View file

@ -521,12 +521,14 @@ class TestInboundMail(IntegrationTestCase):
def test_mail_exist_validation(self): def test_mail_exist_validation(self):
"""Do not create communication record if the mail is already downloaded into the system.""" """Do not create communication record if the mail is already downloaded into the system."""
email_account = frappe.get_doc("Email Account", "_Test Email Account 1")
mail_content = self.get_test_mail(fname="incoming-1.raw") mail_content = self.get_test_mail(fname="incoming-1.raw")
message_id = Email(mail_content).message_id message_id = Email(mail_content).message_id
# Create new communication record in DB # Create new communication record in DB
communication = self.new_communication(message_id=message_id, sent_or_received="Received") communication = self.new_communication(
message_id=message_id, email_account=email_account.name, sent_or_received="Received"
)
email_account = frappe.get_doc("Email Account", "_Test Email Account 1")
inbound_mail = InboundMail(mail_content, email_account, 12345, 1) inbound_mail = InboundMail(mail_content, email_account, 12345, 1)
new_communication = inbound_mail.process() new_communication = inbound_mail.process()

5
frappe/email/receive.py
View file

@ -751,7 +751,10 @@ class InboundMail(Email):
return return
return Communication.find_one_by_filters( return Communication.find_one_by_filters(
message_id=self.message_id, sent_or_received="Received", order_by="creation DESC" message_id=self.message_id,
email_account=self.email_account.name,
sent_or_received="Received",
order_by="creation DESC",
) )
def is_sender_same_as_receiver(self): def is_sender_same_as_receiver(self):