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

[hotfix] fixed patch sequence and removed the update_email_queue patch (#4330)

Browse source
This commit is contained in:
Makarand Bauskar 2017-10-17 14:47:06 +05:30 • committed by Rushabh Mehta
parent 9ff3dfcd4c
commit 99fa65cb1a
2 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
frappe/patches.txt
View file

@ -7,8 +7,8 @@ frappe.patches.v7_1.rename_scheduler_log_to_error_log
frappe.patches.v6_1.rename_file_data
frappe.patches.v7_0.re_route #2016-06-27
frappe.patches.v7_2.remove_in_filter
execute:frappe.reload_doc('core', 'doctype', 'doctype', force=True) #2017-03-09
frappe.patches.v8_0.drop_in_dialog
execute:frappe.reload_doc('core', 'doctype', 'doctype', force=True) #2017-03-09
execute:frappe.reload_doc('core', 'doctype', 'docfield', force=True) #2017-03-03
execute:frappe.reload_doc('core', 'doctype', 'docperm') #2017-03-03
frappe.patches.v8_0.drop_is_custom_from_docperm
@ -191,6 +191,5 @@ frappe.patches.v8_1.delete_custom_docperm_if_doctype_not_exists
frappe.patches.v8_5.delete_email_group_member_with_invalid_emails
frappe.patches.v8_x.update_user_permission
frappe.patches.v8_5.patch_event_colors
frappe.patches.v8_7.update_email_queue_status
frappe.patches.v8_10.delete_static_web_page_from_global_search
frappe.patches.v8_x.add_bgn_xaf_xof_currencies

13
frappe/patches/v8_7/update_email_queue_status.py
View file

@ -1,13 +0,0 @@
from __future__ import unicode_literals
import frappe
from frappe.email.smtp import get_default_outgoing_email_account
def execute():
# set the email queue status to Not Sent if google_analytics_id is UA-8911157-19
default_email_account = get_default_outgoing_email_account()
if frappe.conf.get("google_analytics_id") == "UA-8911157-19" or \
(default_email_account and default_email_account.email_id == "notifications@erpnext.com"):
frappe.db.sql("""update `tabEmail Queue` set status='Not Sent' where
creation>=DATE_SUB(NOW(), INTERVAL 16 HOUR)""")