Merge pull request #1203 from anandpdoshi/hotfix-scheduler-errors
[fix] scheduler error email digest
diff --git a/patches/1311/p07_scheduler_errors_digest.py b/patches/1311/p07_scheduler_errors_digest.py
index b1fa78e..6811571 100644
--- a/patches/1311/p07_scheduler_errors_digest.py
+++ b/patches/1311/p07_scheduler_errors_digest.py
@@ -12,11 +12,20 @@
if not system_managers:
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
edigest = webnotes.new_bean("Email Digest")
edigest.doc.fields.update({
"name": "Scheduler Errors",
- "company": webnotes.conn.get_default("company"),
+ "company": company,
"frequency": "Daily",
"enabled": 1,
"recipient_list": "\n".join(system_managers),
diff --git a/setup/page/setup_wizard/setup_wizard.py b/setup/page/setup_wizard/setup_wizard.py
index b5133ef..962f600 100644
--- a/setup/page/setup_wizard/setup_wizard.py
+++ b/setup/page/setup_wizard/setup_wizard.py
@@ -175,7 +175,8 @@
if not system_managers:
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):
edigest = webnotes.bean({
"doctype": "Email Digest",
@@ -192,16 +193,17 @@
edigest.insert()
# scheduler errors digest
- edigest = webnotes.new_bean("Email Digest")
- edigest.doc.fields.update({
- "name": "Scheduler Errors",
- "company": webnotes.conn.get_default("company"),
- "frequency": "Daily",
- "recipient_list": "\n".join(system_managers),
- "scheduler_errors": 1,
- "enabled": 1
- })
- edigest.insert()
+ if companies:
+ edigest = webnotes.new_bean("Email Digest")
+ edigest.doc.fields.update({
+ "name": "Scheduler Errors",
+ "company": companies[0],
+ "frequency": "Daily",
+ "recipient_list": "\n".join(system_managers),
+ "scheduler_errors": 1,
+ "enabled": 1
+ })
+ edigest.insert()
def get_fy_details(fy_start_date, fy_end_date):
start_year = getdate(fy_start_date).year