Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion frappe/email/doctype/auto_email_report/auto_email_report.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,18 @@ def validate_emails(self):
valid.append(email)

self.email_to = "\n".join(valid)

def filter_enabled_recipients(self):
updated_receipient_list = []
current_receipient_list = self.email_to.split()
for each_email in current_receipient_list:
if frappe.db.exists("User", each_email):
if frappe.db.get_value("User", each_email, "enabled"):
updated_receipient_list.append(each_email)
else:
updated_receipient_list.append(each_email)
return updated_receipient_list


def validate_report_count(self):
count = frappe.db.count("Auto Email Report", {"user": self.user, "enabled": 1})
Expand Down Expand Up @@ -271,9 +283,11 @@ def send(self):

if not self.format == "HTML":
attachments = [{"fname": self.get_file_name(), "fcontent": data}]

filterd_recipients = self.filter_enabled_recipients()

frappe.sendmail(
recipients=self.email_to.split(),
recipients=filterd_recipients,
sender=formataddr((self.sender, self.sender_email)) if self.sender else "",
subject=self.name,
message=message,
Expand Down
Loading