From df49e1d58d7a0542d8793a5bb881890a821855e6 Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Fri, 5 Jun 2015 15:50:37 +0530 Subject: [PATCH] [fix] Check bulk limit if email_account from site_config.json --- frappe/email/bulk.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/email/bulk.py b/frappe/email/bulk.py index 1ee93f754b..280e2d6d60 100644 --- a/frappe/email/bulk.py +++ b/frappe/email/bulk.py @@ -112,7 +112,8 @@ def check_bulk_limit(recipients): # No limit for own email settings smtp_server = SMTPServer() - if smtp_server.email_account and not getattr(smtp_server.email_account, + + if smtp_server.email_account and getattr(smtp_server.email_account, "from_site_config", False) or frappe.flags.in_test: monthly_bulk_mail_limit = frappe.conf.get('monthly_bulk_mail_limit') or 500