Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Email digest gets deleted if even one is disabled.

Browse Source
This commit is contained in:
Anand Doshi 2011-12-23 11:55:00 +05:30
parent f5d5f10ff3
commit bd269cdbe7
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/setup/doctype/email_digest/email_digest.py
View File

@ -417,7 +417,6 @@ class DocType:
sch = Scheduler() sch = Scheduler()
sch.connect() sch.connect()
if self.doc.enabled == 1: if self.doc.enabled == 1:
# Create scheduler entry # Create scheduler entry
res = sch.conn.sql(""" res = sch.conn.sql("""
@ -429,14 +428,20 @@ class DocType:
if not (res and res[0]): if not (res and res[0]):
args['next_execution'] = self.get_next_execution() args['next_execution'] = self.get_next_execution()
sch.conn.begin()
sch.conn.sql(""" sch.conn.sql("""
INSERT INTO Event (db_name, event, `interval`, next_execution, recurring) INSERT INTO Event (db_name, event, `interval`, next_execution, recurring)
VALUES (%(db_name)s, %(event)s, 86400, %(next_execution)s, 1) VALUES (%(db_name)s, %(event)s, 86400, %(next_execution)s, 1)
""", args) """, args)
sch.conn.commit()
else: else:
# delete scheduler entry # 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']) sch.clear(args['db_name'], args['event'])
#print "after on update" #print "after on update"