From bd269cdbe760d92334bf99ddcb15907e2554f487 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 23 Dec 2011 11:55:00 +0530 Subject: [PATCH] Fix: Email digest gets deleted if even one is disabled. --- erpnext/setup/doctype/email_digest/email_digest.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/erpnext/setup/doctype/email_digest/email_digest.py b/erpnext/setup/doctype/email_digest/email_digest.py index cd84d1098a..e599e7b058 100644 --- a/erpnext/setup/doctype/email_digest/email_digest.py +++ b/erpnext/setup/doctype/email_digest/email_digest.py @@ -417,7 +417,6 @@ class DocType: sch = Scheduler() sch.connect() - if self.doc.enabled == 1: # Create scheduler entry res = sch.conn.sql(""" @@ -429,15 +428,21 @@ class DocType: if not (res and res[0]): args['next_execution'] = self.get_next_execution() - + sch.conn.begin() sch.conn.sql(""" INSERT INTO Event (db_name, event, `interval`, next_execution, recurring) VALUES (%(db_name)s, %(event)s, 86400, %(next_execution)s, 1) """, args) + sch.conn.commit() else: - # delete scheduler entry - sch.clear(args['db_name'], args['event']) + # delete scheduler entry if no other email digest is enabled + res = webnotes.conn.sql(""" + SELECT * FROM `tabEmail Digest` + WHERE enabled=1 + """) + if not (res and res[0]): + sch.clear(args['db_name'], args['event']) #print "after on update"