diff --git a/frappe/__init__.py b/frappe/__init__.py index ad940cf91c..9c3ece040d 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, get_jloader) -__version__ = '10.1.44' +__version__ = '10.1.45' __title__ = "Frappe Framework" local = Local() diff --git a/frappe/integrations/doctype/dropbox_settings/dropbox_settings.json b/frappe/integrations/doctype/dropbox_settings/dropbox_settings.json index 35efabd705..b429cbcc34 100644 --- a/frappe/integrations/doctype/dropbox_settings/dropbox_settings.json +++ b/frappe/integrations/doctype/dropbox_settings/dropbox_settings.json @@ -82,6 +82,39 @@ "bold": 0, "collapsible": 0, "columns": 0, + "default": "1", + "description": "Note: By default emails for failed backups are sent.", + "fieldname": "send_email_for_successful_backup", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Send Email for Successful Backup", + "length": 0, + "no_copy": 0, + "options": "", + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, "fieldname": "backup_frequency", "fieldtype": "Select", "hidden": 0, @@ -346,7 +379,7 @@ "issingle": 1, "istable": 0, "max_attachments": 0, - "modified": "2018-06-28 21:28:06.612052", + "modified": "2018-08-07 04:00:40.520943", "modified_by": "Administrator", "module": "Integrations", "name": "Dropbox Settings", diff --git a/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py b/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py index b7a7231d79..f2cdded375 100644 --- a/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py +++ b/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py @@ -64,6 +64,9 @@ def take_backup_to_dropbox(retry_count=0, upload_db_backup=True): def send_email(success, service_name, error_status=None): if success: + if frappe.db.get_value("Dropbox Settings", None, "send_email_for_successful_backup") == '0': + return + subject = "Backup Upload Successful" message ="""
Hi there, this is just to inform you that your backup was successfully uploaded to your %s account. So relax!
diff --git a/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.json b/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.json index 160ed6d50b..b609d7e025 100755 --- a/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.json +++ b/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.json @@ -72,6 +72,38 @@ "set_only_once": 0, "unique": 0 }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "default": "1", + "description": "Note: By default emails for failed backups are sent.", + "fieldname": "send_email_for_successful_backup", + "fieldtype": "Check", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Send Email for Successful Backup", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, { "allow_bulk_edit": 0, "allow_on_submit": 0, @@ -264,7 +296,7 @@ "issingle": 1, "istable": 0, "max_attachments": 0, - "modified": "2017-10-06 18:27:09.022674", + "modified": "2018-08-07 04:12:43.691760", "modified_by": "Administrator", "module": "Integrations", "name": "S3 Backup Settings", diff --git a/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.py b/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.py index fb4c5cf411..b51a2c09c8 100755 --- a/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.py +++ b/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.py @@ -77,6 +77,9 @@ def take_backups_s3(): def send_email(success, service_name, error_status=None): if success: + if frappe.db.get_value("S3 Backup Settings", None, "send_email_for_successful_backup") == '0': + return + subject = "Backup Upload Successful" message = """Hi there, this is just to inform you that your backup was successfully uploaded to your Amazon S3 bucket. So relax!
""" diff --git a/frappe/public/js/frappe/views/reports/reportview.js b/frappe/public/js/frappe/views/reports/reportview.js index 40cf915bc7..b3b454afee 100644 --- a/frappe/public/js/frappe/views/reports/reportview.js +++ b/frappe/public/js/frappe/views/reports/reportview.js @@ -634,7 +634,7 @@ frappe.views.ReportView = frappe.ui.BaseList.extend({ data.forEach(function(row, ri) { $.each(row, function(key, value) { if (key in field_map) { - totals_row[key] = (totals_row[key] || 0) + value; + totals_row[key] = (totals_row[key] || 0) + (value || 0); } }); });