Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[setup] fetch setup config

Browse Source
This commit is contained in:
Prateeksha Singh 2018-11-13 12:21:23 +05:30
parent 39b8765961
commit 179d82702e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/setup/setup_wizard/setup_wizard.py
View File

@ -13,6 +13,7 @@ from frappe import _, _dict
from frappe.utils import cstr, getdate from frappe.utils import cstr, getdate
from argparse import Namespace from argparse import Namespace
from frappe.desk.page.setup_wizard.setup_wizard import update_global_settings, run_post_setup_complete, make_records from frappe.desk.page.setup_wizard.setup_wizard import update_global_settings, run_post_setup_complete, make_records
from journeys.journeys.config import get_journeys_config
def get_setup_stages(args=None): def get_setup_stages(args=None):
if frappe.db.sql("select name from tabCompany"): if frappe.db.sql("select name from tabCompany"):
@ -125,7 +126,7 @@ def login_as_first_user(args):
@frappe.whitelist() @frappe.whitelist()
def install_fixtures(config=None): def install_fixtures(config=None):
if not config: if not config:
config = frappe.local.conf.setup or {} config = get_journeys_config().get('setup_config') or {}
update_global_settings(_dict(config)) update_global_settings(_dict(config))
@ -133,9 +134,8 @@ def install_fixtures(config=None):
@frappe.whitelist() @frappe.whitelist()
def make_setup_docs(args, config=None): def make_setup_docs(args, config=None):
# TODO: get from not site conf
if not config: if not config:
config = frappe.local.conf.setup or {} config = get_journeys_config().get('setup_config') or {}
args = json.loads(args) args = json.loads(args)