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

Merge pull request #1147 from pdvyas/fix-bulk-limit-check

Browse source 
[fix] Check bulk limit if email_account from site_config.json
This commit is contained in:
Nabin Hait 2015-06-05 15:53:53 +05:30
commit b9bbc367c6
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
frappe/email/bulk.py
View file

@ -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