From bcecf23772ca04fbd65e96273f899bef62bb1bad Mon Sep 17 00:00:00 2001 From: mbauskar Date: Wed, 20 Sep 2017 11:51:09 +0530 Subject: [PATCH] [minor] moved code to set_incoming_outgoing_accounts method --- frappe/core/doctype/communication/email.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/communication/email.py b/frappe/core/doctype/communication/email.py index 894f324d2b..b8a8b4ec30 100755 --- a/frappe/core/doctype/communication/email.py +++ b/frappe/core/doctype/communication/email.py @@ -233,8 +233,6 @@ def prepare_to_notify(doc, print_html=None, print_format=None, attachments=None) doc.content += get_attach_link(doc, print_format) set_incoming_outgoing_accounts(doc) - if doc.sent_or_received == "Sent": - doc.db_set("email_account", doc.outgoing_email_account.name) if not doc.sender: doc.sender = doc.outgoing_email_account.email_id @@ -291,6 +289,9 @@ def set_incoming_outgoing_accounts(doc): {"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) + def get_recipients(doc, fetched_from_email_account=False): """Build a list of email addresses for To""" # [EDGE CASE] doc.recipients can be None when an email is sent as BCC