Merge branch 'master' into develop

This commit is contained in:
Nabin Hait 2018-04-07 19:57:04 +05:30
commit ef536e055b
4 changed files with 4 additions and 8 deletions

View file

@ -17,7 +17,7 @@ from faker import Faker
from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
__version__ = '10.1.18'
__version__ = '10.1.19'
__title__ = "Frappe Framework"
local = Local()

View file

@ -373,11 +373,6 @@ def get_bcc(doc, recipients=None, fetched_from_email_account=False):
"""Build a list of email addresses for BCC"""
bcc = split_emails(doc.bcc)
if doc.reference_doctype and doc.reference_name:
if fetched_from_email_account:
bcc.append(get_owner_email(doc))
bcc += get_assignees(doc)
if bcc:
exclude = []
exclude += [d[0] for d in frappe.db.get_all("User", ["name"], {"thread_notify": 0}, as_list=True)]

View file

@ -204,7 +204,8 @@ def get_email_queue(recipients, sender, subject, **kwargs):
frappe.log_error('Invalid Email ID Sender: {0}, Recipients: {1}'.format(mail.sender,
', '.join(mail.recipients)), 'Email Not Sent')
e.set_recipients(recipients + kwargs.get('cc', []) + kwargs.get('bcc', []))
recipients = list(set(recipients + kwargs.get('cc', []) + kwargs.get('bcc', [])))
e.set_recipients(recipients)
e.reference_doctype = kwargs.get('reference_doctype')
e.reference_name = kwargs.get('reference_name')
e.add_unsubscribe_link = kwargs.get("add_unsubscribe_link")

View file

@ -65,7 +65,7 @@ class BackupGenerator:
site = site.replace('.', '_')
#Generate a random name using today's date and a 8 digit random number
for_db = todays_date + "-" + site + "-database.sql"
for_db = todays_date + "-" + site + "-database.sql.gz"
for_public_files = todays_date + "-" + site + "-files.tar"
for_private_files = todays_date + "-" + site + "-private-files.tar"
backup_path = get_backup_path()