From 7a77093bed0db8b583d019f40db405424eeb5c7c Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Fri, 3 Aug 2018 15:59:27 +0530 Subject: [PATCH 1/5] [Fix] Total amount not showing proper if rows has blank value --- frappe/public/js/frappe/views/reports/reportview.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); } }); }); From 04bc51a398bc5577643615d8f7f2aee8e69e2c13 Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Mon, 6 Aug 2018 13:02:03 +0530 Subject: [PATCH 2/5] [hotfix] prevent jinja exec in search title (#5930) --- frappe/www/search.html | 2 +- frappe/www/search.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frappe/www/search.html b/frappe/www/search.html index 00804241e7..f9e4d478e4 100644 --- a/frappe/www/search.html +++ b/frappe/www/search.html @@ -1,7 +1,7 @@ {% extends "templates/web.html" %} {% block page_content %} -

{{ title }}

+

{{ title }}: "{{ query }}"

diff --git a/frappe/www/search.py b/frappe/www/search.py index c55970c1fc..0a2de8392b 100644 --- a/frappe/www/search.py +++ b/frappe/www/search.py @@ -10,7 +10,8 @@ def get_context(context): context.no_cache = 1 if frappe.form_dict.q: query = str(utils.escape(sanitize_html(frappe.form_dict.q))) - context.title = _('Search Results for "{0}"').format(query) + context.title = _('Search Results for') + context.query = query context.update(get_search_results(query)) else: context.title = _('Search') From 51d5577bb13f0a9a0682352ef10750f9078749ba Mon Sep 17 00:00:00 2001 From: Ameya Shenoy Date: Mon, 6 Aug 2018 22:38:40 +0000 Subject: [PATCH 3/5] [minor][feature] make dropbox backup successful message optional --- .../dropbox_settings/dropbox_settings.json | 35 ++++++++++++++++++- .../dropbox_settings/dropbox_settings.py | 3 ++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/frappe/integrations/doctype/dropbox_settings/dropbox_settings.json b/frappe/integrations/doctype/dropbox_settings/dropbox_settings.json index a8ab581bf7..3fe21283c3 100644 --- a/frappe/integrations/doctype/dropbox_settings/dropbox_settings.json +++ b/frappe/integrations/doctype/dropbox_settings/dropbox_settings.json @@ -71,6 +71,39 @@ "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, + "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, @@ -295,7 +328,7 @@ "issingle": 1, "istable": 0, "max_attachments": 0, - "modified": "2018-03-22 16:02:00.597029", + "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 1afc06eb5c..faf818b0a8 100644 --- a/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py +++ b/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py @@ -56,6 +56,9 @@ def take_backup_to_dropbox(): 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 ="""

Backup Uploaded Successfully

Hi there, this is just to inform you that your backup was successfully uploaded to your %s account. So relax!

From 1d89dcea75a179f8fc0629b2e86369737a5e4da6 Mon Sep 17 00:00:00 2001 From: Ameya Shenoy Date: Mon, 6 Aug 2018 22:44:56 +0000 Subject: [PATCH 4/5] [minor][feature] make email for successful S3 backup optional --- .../s3_backup_settings.json | 34 ++++++++++++++++++- .../s3_backup_settings/s3_backup_settings.py | 3 ++ 2 files changed, 36 insertions(+), 1 deletion(-) 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 0cdc8e1dd6..fe90e6ddd8 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, @@ -234,7 +266,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 64bbc869a7..4c15b6dd86 100755 --- a/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.py +++ b/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.py @@ -74,6 +74,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 = """

Backup Uploaded Successfully!

Hi there, this is just to inform you that your backup was successfully uploaded to your Amazon S3 bucket. So relax!

""" From e3382f8aec48121ff3e56d38b925e31307f48389 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Tue, 7 Aug 2018 13:12:53 +0600 Subject: [PATCH 5/5] bumped to version 10.1.45 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 3109ba042c..9dd5cc427b 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.44' +__version__ = '10.1.45' __title__ = "Frappe Framework" local = Local()