diff --git a/frappe/__init__.py b/frappe/__init__.py index 8121b0fc03..e526ff59fe 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -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() diff --git a/frappe/core/doctype/communication/email.py b/frappe/core/doctype/communication/email.py index e9464a5a5b..8121e13788 100755 --- a/frappe/core/doctype/communication/email.py +++ b/frappe/core/doctype/communication/email.py @@ -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)] diff --git a/frappe/email/queue.py b/frappe/email/queue.py index 80fce6ab1d..0a637db727 100755 --- a/frappe/email/queue.py +++ b/frappe/email/queue.py @@ -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") diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index db3efac2f7..f0729d672d 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -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()