Ver a proveniência

Merge branch 'hotfix'

version-14
mbauskar há 8 anos
ascendente
cometimento
553b30593d
3 ficheiros alterados com 2 adições e 17 eliminações
  1. +1
    -1
      frappe/__init__.py
  2. +0
    -15
      frappe/desk/page/setup_wizard/setup_wizard.js
  3. +1
    -1
      frappe/installer.py

+ 1
- 1
frappe/__init__.py Ver ficheiro

@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
from .exceptions import * from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template 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" __title__ = "Frappe Framework"


local = Local() local = Local()


+ 0
- 15
frappe/desk/page/setup_wizard/setup_wizard.js Ver ficheiro

@@ -648,21 +648,6 @@ var utils = {
slide.get_field("timezone").set_input(frappe.wizard.values.timezone); 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) { bind_language_events: function(slide) {


+ 1
- 1
frappe/installer.py Ver ficheiro

@@ -125,7 +125,7 @@ def install_app(name, verbose=False, set_as_patched=True):
frappe.msgprint(_("App {0} already installed").format(name)) frappe.msgprint(_("App {0} already installed").format(name))
return return


print("Installing {0}...".format(name))
print("\nInstalling {0}...".format(name))


if name != "frappe": if name != "frappe":
frappe.only_for("System Manager") frappe.only_for("System Manager")


Carregando…
Cancelar
Guardar