Merge pull request #1203 from anandpdoshi/hotfix-scheduler-errors

[fix] scheduler error email digest
This commit is contained in:
Pratik Vyas 2013-12-18 01:10:12 -08:00
commit ef295d2977
2 changed files with 23 additions and 12 deletions

View File

@ -12,11 +12,20 @@ def execute():
if not system_managers: if not system_managers:
return return
# no default company
company = webnotes.conn.get_default("company")
if not company:
company = webnotes.conn.sql_list("select name from `tabCompany`")
if company:
company = company[0]
if not company:
return
# scheduler errors digest # scheduler errors digest
edigest = webnotes.new_bean("Email Digest") edigest = webnotes.new_bean("Email Digest")
edigest.doc.fields.update({ edigest.doc.fields.update({
"name": "Scheduler Errors", "name": "Scheduler Errors",
"company": webnotes.conn.get_default("company"), "company": company,
"frequency": "Daily", "frequency": "Daily",
"enabled": 1, "enabled": 1,
"recipient_list": "\n".join(system_managers), "recipient_list": "\n".join(system_managers),

View File

@ -175,7 +175,8 @@ def create_email_digest():
if not system_managers: if not system_managers:
return return
for company in webnotes.conn.sql_list("select name FROM `tabCompany`"): companies = webnotes.conn.sql_list("select name FROM `tabCompany`")
for company in companies:
if not webnotes.conn.exists("Email Digest", "Default Weekly Digest - " + company): if not webnotes.conn.exists("Email Digest", "Default Weekly Digest - " + company):
edigest = webnotes.bean({ edigest = webnotes.bean({
"doctype": "Email Digest", "doctype": "Email Digest",
@ -192,16 +193,17 @@ def create_email_digest():
edigest.insert() edigest.insert()
# scheduler errors digest # scheduler errors digest
edigest = webnotes.new_bean("Email Digest") if companies:
edigest.doc.fields.update({ edigest = webnotes.new_bean("Email Digest")
"name": "Scheduler Errors", edigest.doc.fields.update({
"company": webnotes.conn.get_default("company"), "name": "Scheduler Errors",
"frequency": "Daily", "company": companies[0],
"recipient_list": "\n".join(system_managers), "frequency": "Daily",
"scheduler_errors": 1, "recipient_list": "\n".join(system_managers),
"enabled": 1 "scheduler_errors": 1,
}) "enabled": 1
edigest.insert() })
edigest.insert()
def get_fy_details(fy_start_date, fy_end_date): def get_fy_details(fy_start_date, fy_end_date):
start_year = getdate(fy_start_date).year start_year = getdate(fy_start_date).year