浏览代码

[Fix] Sent email not displaying in the list (#4668)

version-14
rohitwaghchaure 7 年前
committed by Nabin Hait
父节点
当前提交
337564eea2
共有 1 个文件被更改,包括 5 次插入5 次删除
  1. +5
    -5
      frappe/core/doctype/communication/email.py

+ 5
- 5
frappe/core/doctype/communication/email.py 查看文件

@@ -304,17 +304,17 @@ def set_incoming_outgoing_accounts(doc):
doc.incoming_email_account = frappe.db.get_value("Email Account",
{"default_incoming": 1, "enable_incoming": 1}, "email_id")

if not doc.outgoing_email_account:
doc.outgoing_email_account = frappe.db.get_value("Email Account",
{"default_outgoing": 1, "enable_outgoing": 1},
["email_id", "always_use_account_email_id_as_sender", "name", "send_unsubscribe_message"],as_dict=True) or frappe._dict()

if not doc.outgoing_email_account:
# if from address is not the default email account
doc.outgoing_email_account = frappe.db.get_value("Email Account",
{"email_id": doc.sender, "enable_outgoing": 1},
["email_id", "always_use_account_email_id_as_sender", "name", "send_unsubscribe_message"], as_dict=True) or frappe._dict()

if not doc.outgoing_email_account:
doc.outgoing_email_account = frappe.db.get_value("Email Account",
{"default_outgoing": 1, "enable_outgoing": 1},
["email_id", "always_use_account_email_id_as_sender", "name", "send_unsubscribe_message"],as_dict=True) or frappe._dict()

if doc.sent_or_received == "Sent":
doc.db_set("email_account", doc.outgoing_email_account.name)



正在加载...
取消
保存