From 04331023a2b302998c86ae98c18a5d8f3c1e22ea Mon Sep 17 00:00:00 2001 From: mbauskar Date: Mon, 3 Apr 2017 11:50:31 +0530 Subject: [PATCH] [minor] minor fixes in email_account and added has_attachment in communication_list.js --- frappe/core/doctype/communication/communication_list.js | 3 ++- frappe/email/doctype/email_account/email_account.py | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/frappe/core/doctype/communication/communication_list.js b/frappe/core/doctype/communication/communication_list.js index e7caf6938f..69cad3ceba 100644 --- a/frappe/core/doctype/communication/communication_list.js +++ b/frappe/core/doctype/communication/communication_list.js @@ -2,7 +2,8 @@ frappe.listview_settings['Communication'] = { add_fields: [ "sent_or_received","recipients", "subject", "communication_medium", "communication_type", - "sender", "seen", "reference_doctype", "reference_name" + "sender", "seen", "reference_doctype", "reference_name", + "has_attachment" ], filters: [["status", "=", "Open"]], diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py index 92e2e3f644..b330b1570d 100755 --- a/frappe/email/doctype/email_account/email_account.py +++ b/frappe/email/doctype/email_account/email_account.py @@ -247,6 +247,9 @@ class EmailAccount(Document): email_sync_rule = self.build_email_sync_rule() email_server = self.get_incoming_server(in_receive=True, email_sync_rule=email_sync_rule) + if not email_server: + return + emails = email_server.get_messages() incoming_mails = emails.get("latest_messages") @@ -595,6 +598,9 @@ class EmailAccount(Document): uid_list = { flag.get("uid", None): flag.get("action", "Read") for flag in flags } if flags and uid_list: email_server = self.get_incoming_server() + if not email_server: + return + email_server.update_flag(uid_list=uid_list) # mark communication as read