From e03937fd6ac82b09624222aa3d4e4565be269591 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 23 May 2018 10:32:55 +0530 Subject: [PATCH] Send daily work summary alert to only enabled users (#14175) * Send daily work summary alert to only enabled users * Fix import --- .../hr/doctype/daily_work_summary/daily_work_summary.py | 9 ++++++--- .../daily_work_summary_group/daily_work_summary_group.py | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py b/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py index 4d3b173ff7..c01c5b9017 100644 --- a/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +++ b/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py @@ -105,10 +105,13 @@ class DailyWorkSummary(Document): def get_user_emails_from_group(group): - '''Returns list of email of users from the given group + '''Returns list of email of enabled users from the given group :param group: Daily Work Summary Group `name`''' - group_doc = frappe.get_doc('Daily Work Summary Group', group) - emails = [d.email for d in group_doc.users] + group_doc = group + if isinstance(group_doc, str): + group_doc = frappe.get_doc('Daily Work Summary Group', group) + + emails = [d.email for d in group_doc.users if frappe.db.get_value("User", d.email, "enabled")] return emails diff --git a/erpnext/hr/doctype/daily_work_summary_group/daily_work_summary_group.py b/erpnext/hr/doctype/daily_work_summary_group/daily_work_summary_group.py index a549a9b6c9..67070bfa53 100644 --- a/erpnext/hr/doctype/daily_work_summary_group/daily_work_summary_group.py +++ b/erpnext/hr/doctype/daily_work_summary_group/daily_work_summary_group.py @@ -7,7 +7,7 @@ import frappe from frappe.model.document import Document import frappe.utils from frappe import _ - +from erpnext.hr.doctype.daily_work_summary.daily_work_summary import get_user_emails_from_group class DailyWorkSummaryGroup(Document): def validate(self): @@ -25,7 +25,7 @@ def trigger_emails(): if (is_current_hour(group_doc.send_emails_at) and not is_holiday_today(group_doc.holiday_list) and group_doc.enabled): - emails = [d.email for d in group_doc.users] + emails = get_user_emails_from_group(group_doc) # find emails relating to a company if emails: daily_work_summary = frappe.get_doc(