From 375e28fbeb41c16f42f3a35ba23f9260e21415ac Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 18 Sep 2015 11:05:42 +0530 Subject: [PATCH] [minor] send_notification_to should be mandatory if notify_if_unreplied is set --- frappe/email/doctype/email_account/email_account.js | 6 +++++- frappe/email/doctype/email_account/email_account.json | 3 ++- frappe/email/doctype/email_account/email_account.py | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/frappe/email/doctype/email_account/email_account.js b/frappe/email/doctype/email_account/email_account.js index ad369befe1..414c2fb92c 100644 --- a/frappe/email/doctype/email_account/email_account.js +++ b/frappe/email/doctype/email_account/email_account.js @@ -41,12 +41,16 @@ frappe.ui.form.on("Email Account", { enable_incoming: function(frm) { frm.set_df_property("append_to", "reqd", frm.doc.enable_incoming); }, + notify_if_unreplied: function(frm) { + frm.set_df_property("send_notification_to", "reqd", frm.doc.notify_if_unreplied); + }, onload: function(frm) { frm.set_df_property("append_to", "only_select", true); frm.set_query("append_to", "frappe.email.doctype.email_account.email_account.get_append_to"); }, refresh: function(frm) { - frm.set_df_property("append_to", "reqd", frm.doc.enable_incoming); + frm.events.enable_incoming(frm); + frm.events.notify_if_unreplied(frm); } }); diff --git a/frappe/email/doctype/email_account/email_account.json b/frappe/email/doctype/email_account/email_account.json index c7928f2a9d..753bee092b 100644 --- a/frappe/email/doctype/email_account/email_account.json +++ b/frappe/email/doctype/email_account/email_account.json @@ -382,6 +382,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "default": "30", "depends_on": "notify_if_unreplied", "fieldname": "unreplied_for_mins", "fieldtype": "Int", @@ -779,7 +780,7 @@ "is_submittable": 0, "issingle": 0, "istable": 0, - "modified": "2015-07-28 16:18:12.116327", + "modified": "2015-09-18 01:34:31.784444", "modified_by": "Administrator", "module": "Email", "name": "Email Account", diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py index 33f1ee0492..7478fea9f7 100644 --- a/frappe/email/doctype/email_account/email_account.py +++ b/frappe/email/doctype/email_account/email_account.py @@ -54,6 +54,8 @@ class EmailAccount(Document): self.check_smtp() if self.notify_if_unreplied: + if not self.send_notification_to: + frappe.throw(_("{0} is mandatory").format(self.meta.get_label("send_notification_to"))) for e in self.get_unreplied_notification_emails(): validate_email_add(e, True)