[fix] more rename from bulk to email queue

frappe/__init__.py

@@ -367,7 +367,7 @@ def sendmail(recipients=(), sender="", subject="No Subject", message="No Message
 	:param subject: Email Subject.
 	:param message: (or `content`) Email Content.
 	:param as_markdown: Convert content markdown to HTML.
-	:param delayed: Send via scheduled email sender **Email Queue**. Don't send immediately.
+	:param delayed: Send via scheduled email sender **Email Queue**. Don't send immediately. Default is true
 	:param send_priority: Priority for Email Queue, default 1.
 	:param reference_doctype: (or `doctype`) Append as communication to this DocType.
 	:param reference_name: (or `name`) Append as communication to this document name.

frappe/email/queue.py

@@ -335,7 +335,7 @@ def clear_outbox():
 	frappe.db.sql("""delete from `tabEmail Queue` where
 		datediff(now(), creation) > 31""")
 
-def prevent_bulk_email_delete(doc, method):
+def prevent_email_queue_delete(doc, method):
 	from frappe.limits import get_limits
 	if frappe.session.user != 'Administrator' and get_limits().get('block_bulk_email_delete'):
 		frappe.throw(_('Only Administrator can delete Email Queue'))

frappe/hooks.py

@@ -100,7 +100,7 @@ doc_events = {
 		"validate": "frappe.utils.user.validate_user_limit"
 	},
 	"Email Queue": {
-		"on_trash": "frappe.email.bulk.prevent_bulk_email_delete"
+		"on_trash": "frappe.email.queue.prevent_email_queue_delete"
 	},
 	"*": {
 		"after_insert": "frappe.email.doctype.email_alert.email_alert.trigger_email_alerts",

frappe/limits.py

@@ -72,7 +72,7 @@ def get_expiry_message():
 def get_limits():
 	limits = frappe.get_conf().get("limits") or {}
 	day = frappe.utils.add_months(frappe.utils.today(), -1)
-	limits["bulk_count"] = frappe.db.count("Email Queue", filters={'creation': ['>', day]})
+	limits["emails_sent"] = frappe.db.count("Email Queue", filters={'creation': ['>', day]})
 	return limits