From 728a94ba3cf50ea117217fe73739f24f8b08913c Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 24 May 2017 18:40:48 +0530 Subject: [PATCH 1/5] Changed modified timestamp for system_settings --- frappe/core/doctype/system_settings/system_settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/core/doctype/system_settings/system_settings.json b/frappe/core/doctype/system_settings/system_settings.json index 5db186d340..937de3ecf9 100644 --- a/frappe/core/doctype/system_settings/system_settings.json +++ b/frappe/core/doctype/system_settings/system_settings.json @@ -933,7 +933,7 @@ "issingle": 1, "istable": 0, "max_attachments": 0, - "modified": "2017-05-19 09:12:50.353887", + "modified": "2017-05-23 09:12:50.353877", "modified_by": "Administrator", "module": "Core", "name": "System Settings", From a124734860e8f1f55d81429d5566390d79824a97 Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Thu, 25 May 2017 15:47:30 +0530 Subject: [PATCH 2/5] [fix] remove redundant progress modal frappe/erpnext#8993 (#3389) --- frappe/public/js/frappe/upload.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/upload.js b/frappe/public/js/frappe/upload.js index d83bc5d4a0..3508d76eb6 100644 --- a/frappe/public/js/frappe/upload.js +++ b/frappe/public/js/frappe/upload.js @@ -198,7 +198,9 @@ frappe.upload = { i += 1; var file = files[i]; args.is_private = file.is_private; - frappe.show_progress(__('Uploading'), i+1, files.length); + if(!opts.progress) { + frappe.show_progress(__('Uploading'), i+1, files.length); + } } frappe.upload.upload_file(file, args, opts); } From edeee39122d9c7ee0e78284087c67b1f9b37a5d5 Mon Sep 17 00:00:00 2001 From: Makarand Bauskar Date: Fri, 26 May 2017 11:06:51 +0530 Subject: [PATCH 3/5] [minor] fixed pdf export issue for the reports (#3391) --- frappe/public/js/frappe/views/reports/query_report.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 31b2c5dff1..5277aaef15 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -215,6 +215,8 @@ frappe.views.QueryReport = Class.extend({ return false; } + var orientation = this.print_settings.orientation; + var landscape = orientation == "Landscape" ? true: false if(this.html_format) { var content = frappe.render(this.html_format, {data: frappe.slickgrid_tools.get_filtered_items(this.dataView), filters:this.get_values(), report:this}); @@ -225,7 +227,8 @@ frappe.views.QueryReport = Class.extend({ title:__(this.report_name), base_url: base_url, print_css: print_css, - print_settings: this.print_settings + print_settings: this.print_settings, + landscape: landscape }); } else { // rows filtered by inline_filter of slickgrid @@ -249,7 +252,8 @@ frappe.views.QueryReport = Class.extend({ title:__(this.report_name), base_url: base_url, print_css: print_css, - print_settings: this.print_settings + print_settings: this.print_settings, + landscape: landscape }); } From 9149fbc5df6df468e6c6ff071d8dadf1f4b1a8a6 Mon Sep 17 00:00:00 2001 From: Makarand Bauskar Date: Fri, 26 May 2017 12:44:38 +0530 Subject: [PATCH 4/5] [minor] fixes for default print format appears twice (#3392) --- frappe/printing/doctype/print_format/print_format.py | 5 ++++- frappe/public/js/frappe/model/meta.js | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/frappe/printing/doctype/print_format/print_format.py b/frappe/printing/doctype/print_format/print_format.py index 7b8a2f178d..7c9afe9844 100644 --- a/frappe/printing/doctype/print_format/print_format.py +++ b/frappe/printing/doctype/print_format/print_format.py @@ -77,4 +77,7 @@ def make_default(name): 'value': name, }) - frappe.msgprint(frappe._("Done")) + frappe.msgprint(frappe._("{0} is now default print format for {1} doctype").format( + frappe.bold(name), + frappe.bold(print_format.doc_type) + )) diff --git a/frappe/public/js/frappe/model/meta.js b/frappe/public/js/frappe/model/meta.js index 4b2da32bb2..542588324f 100644 --- a/frappe/public/js/frappe/model/meta.js +++ b/frappe/public/js/frappe/model/meta.js @@ -208,8 +208,8 @@ $.extend(frappe.meta, { }); if(default_print_format && default_print_format != "Standard") { - var index = print_format_list.indexOf(default_print_format) - 1; - print_format_list.sort().splice(index, 1); + var index = print_format_list.indexOf(default_print_format); + print_format_list.splice(index, 1).sort(); print_format_list.unshift(default_print_format); } From 6829dadbda378baa26b9774fde6cf8c2536e958b Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 26 May 2017 22:06:16 +0600 Subject: [PATCH 5/5] bumped to version 8.0.60 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index f3ec219288..32de5c580d 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json from .exceptions import * from .utils.jinja import get_jenv, get_template, render_template -__version__ = '8.0.59' +__version__ = '8.0.60' __title__ = "Frappe Framework" local = Local()