From c3598c252141092efec0bde061dc511c995c64e0 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 20 Jul 2017 15:54:34 +0530 Subject: [PATCH 1/2] [minor] setup wizard fixes --- frappe/desk/page/setup_wizard/setup_wizard.js | 15 --------------- frappe/installer.py | 2 +- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/frappe/desk/page/setup_wizard/setup_wizard.js b/frappe/desk/page/setup_wizard/setup_wizard.js index 9b7bc1f4b6..c5aab1c178 100644 --- a/frappe/desk/page/setup_wizard/setup_wizard.js +++ b/frappe/desk/page/setup_wizard/setup_wizard.js @@ -648,21 +648,6 @@ var utils = { slide.get_field("timezone").set_input(frappe.wizard.values.timezone); } - country_field.df.description = 'fetching country...'; - country_field.set_description(); - - // get location from IP (unreliable) - frappe.call({ - method:"frappe.desk.page.setup_wizard.setup_wizard.load_country", - callback: function(r) { - if(r.message) { - slide.get_field("country").set_input(r.message); - slide.get_input("country").trigger('change'); - } - country_field.df.description = ''; - country_field.set_description(); - } - }); }, bind_language_events: function(slide) { diff --git a/frappe/installer.py b/frappe/installer.py index 8b061428e3..0674c4c101 100755 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -125,7 +125,7 @@ def install_app(name, verbose=False, set_as_patched=True): frappe.msgprint(_("App {0} already installed").format(name)) return - print("Installing {0}...".format(name)) + print("\nInstalling {0}...".format(name)) if name != "frappe": frappe.only_for("System Manager") From 7f8125e273c44368a2628d160f652d9f0881f195 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Thu, 20 Jul 2017 17:18:55 +0600 Subject: [PATCH 2/2] bumped to version 8.5.7 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 8fcb74d650..ea4e241278 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__ = '8.5.6' +__version__ = '8.5.7' __title__ = "Frappe Framework" local = Local()