From 1fce0b1f79c23a9c938bdc83ccb22e2b43129faa Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 18 Dec 2013 13:22:18 +0530 Subject: [PATCH 1/2] [fix] scheduler error email digest --- patches/1311/p07_scheduler_errors_digest.py | 11 +++++++++- setup/page/setup_wizard/setup_wizard.py | 24 +++++++++++---------- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/patches/1311/p07_scheduler_errors_digest.py b/patches/1311/p07_scheduler_errors_digest.py index b1fa78e14fc..6811571ab91 100644 --- a/patches/1311/p07_scheduler_errors_digest.py +++ b/patches/1311/p07_scheduler_errors_digest.py @@ -12,11 +12,20 @@ def execute(): 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 b5133ef479d..962f600ca21 100644 --- a/setup/page/setup_wizard/setup_wizard.py +++ b/setup/page/setup_wizard/setup_wizard.py @@ -175,7 +175,8 @@ def create_email_digest(): 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 @@ def create_email_digest(): 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 From b645a217fd5c26017bf2360acd27ea79aeb07c43 Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Wed, 18 Dec 2013 15:10:36 +0600 Subject: [PATCH 2/2] bumped to version 3.3.2 --- config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.json b/config.json index d7dcbc1aef3..68782da730e 100644 --- a/config.json +++ b/config.json @@ -1,6 +1,6 @@ { "app_name": "ERPNext", - "app_version": "3.3.1", + "app_version": "3.3.2", "base_template": "app/portal/templates/base.html", "modules": { "Accounts": {