From a8f9a652e1990f9eb1f07e731d4cfb84be21ef6c Mon Sep 17 00:00:00 2001 From: Ameya Shenoy Date: Sat, 7 Apr 2018 19:55:01 +0530 Subject: [PATCH 1/3] dropbox backup not ablt to find filepath (#5406) --- frappe/utils/backups.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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() From 4c032eabbe2efc34bf0878d2338231b6239aa06e Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Sat, 7 Apr 2018 19:55:45 +0530 Subject: [PATCH 2/3] Removed owner of the document from the BCC (#5401) --- frappe/core/doctype/communication/email.py | 5 ----- frappe/email/queue.py | 3 ++- 2 files changed, 2 insertions(+), 6 deletions(-) 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 fd0f05767b..f810c6abcf 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") From 755c0e0b05279e482fb6765e2130e3c1f39a27e5 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Sat, 7 Apr 2018 20:27:02 +0600 Subject: [PATCH 3/3] bumped to version 10.1.19 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index e7a9795c8d..a6ae69330f 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json 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()