vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Clear outbox modification (#3628)

Browse source 
* Clear Outbox modification

* Correction of SQL query
This commit is contained in:
Charles-Henri Decultot 2017-07-11 06:53:06 +02:00 • committed by Rushabh Mehta
parent 91ebe48c48
commit 2da4bafa1e
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
frappe/email/queue.py
View file

@ -475,8 +475,7 @@ def clear_outbox():
frappe.db.sql("""delete from `tabEmail Queue Recipient` where parent in (%s)"""
% ','.join(['%s']*len(email_queues)), tuple(email_queues))
for dt in ("Email Queue", "Email Queue Recipient"):
frappe.db.sql("""
update `tab{0}`
set status='Expired'
where datediff(curdate(), modified) > 7 and status='Not Sent'""".format(dt))
frappe.db.sql("""
update `tabEmail Queue`
set status='Expired'
where datediff(curdate(), modified) > 7 and status='Not Sent' and (send_after is null or send_after < %(now)s)""", { 'now': now_datetime() })