浏览代码

Merge pull request #13421 from leela/fix-pop-inbound-mails

fix: inbound mail handling for pop3 protocol
version-14
Leela vadlamudi 4 年前
committed by GitHub
父节点
当前提交
ce26ad2aef
找不到此签名对应的密钥 GPG 密钥 ID: 4AEE18F83AFDEB23
共有 2 个文件被更改,包括 2 次插入6 次删除
  1. +2
    -3
      frappe/email/doctype/email_account/email_account.py
  2. +0
    -3
      frappe/email/receive.py

+ 2
- 3
frappe/email/doctype/email_account/email_account.py 查看文件

@@ -478,14 +478,13 @@ class EmailAccount(Document):
email_server = self.get_incoming_server(in_receive=True, email_sync_rule=email_sync_rule) email_server = self.get_incoming_server(in_receive=True, email_sync_rule=email_sync_rule)
messages = email_server.get_messages() or {} messages = email_server.get_messages() or {}
except Exception: except Exception:
raise
frappe.log_error(title=_("Error while connecting to email account {0}").format(self.name)) frappe.log_error(title=_("Error while connecting to email account {0}").format(self.name))
return [] return []


mails = [] mails = []
for index, message in enumerate(messages.get("latest_messages", [])): for index, message in enumerate(messages.get("latest_messages", [])):
uid = messages['uid_list'][index]
seen_status = 1 if messages['seen_status'][uid]=='SEEN' else 0
uid = messages['uid_list'][index] if messages.get('uid_list') else None
seen_status = 1 if messages.get('seen_status', {}).get(uid)=='SEEN' else 0
mails.append(InboundMail(message, self, uid, seen_status)) mails.append(InboundMail(message, self, uid, seen_status))


return mails return mails


+ 0
- 3
frappe/email/receive.py 查看文件

@@ -738,9 +738,6 @@ class InboundMail(Email):
if not reference_document and self.email_account.append_to: if not reference_document and self.email_account.append_to:
reference_document = self.match_record_by_subject_and_sender(self.email_account.append_to) reference_document = self.match_record_by_subject_and_sender(self.email_account.append_to)


# if not reference_document:
# reference_document = Create_reference_document(self.email_account.append_to)

self._reference_document = reference_document or '' self._reference_document = reference_document or ''
return self._reference_document return self._reference_document




正在加载...
取消
保存