From 461adc7c37e3f16ec089bacf88f53f329355b358 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Wed, 22 Jun 2016 13:19:58 +0530
Subject: [PATCH] [fix] more rename from bulk to email queue

---
 frappe/__init__.py    | 2 +-
 frappe/email/queue.py | 2 +-
 frappe/hooks.py       | 2 +-
 frappe/limits.py      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 83246edf31..869dfc9b2c 100644
--- a/frappe/__init__.py
+++ b/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.
diff --git a/frappe/email/queue.py b/frappe/email/queue.py
index c0859352af..76681ba471 100755
--- a/frappe/email/queue.py
+++ b/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'))
\ No newline at end of file
diff --git a/frappe/hooks.py b/frappe/hooks.py
index c537d814fa..cda7deb5da 100755
--- a/frappe/hooks.py
+++ b/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",
diff --git a/frappe/limits.py b/frappe/limits.py
index 6ad8445973..f6148601d8 100755
--- a/frappe/limits.py
+++ b/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