commit 179d82702e6c45b35c3210606b08ecf91b09af15
author Prateeksha Singh <pratu16x7@gmail.com> Tue Nov 13 12:21:23 2018 +0530
committer Prateeksha Singh <pratu16x7@gmail.com> Wed Dec 12 21:29:54 2018 +0530
tree ee9620c016337c4280e893bf88cdac01a5d40ec4
parent 39b8765961d560ac7ea961f8405a327c7f277e49

[setup] fetch setup config

erpnext/setup/setup_wizard/setup_wizard.py

diff --git a/erpnext/setup/setup_wizard/setup_wizard.py b/erpnext/setup/setup_wizard/setup_wizard.py
index d19dd18..0856689 100644
--- a/erpnext/setup/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/setup_wizard/setup_wizard.py
@@ -13,6 +13,7 @@
 from frappe.utils import cstr, getdate
 from argparse import Namespace
 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):
 	if frappe.db.sql("select name from tabCompany"):
@@ -125,7 +126,7 @@
 @frappe.whitelist()
 def install_fixtures(config=None):
 	if not config:
-		config = frappe.local.conf.setup or {}
+		config = get_journeys_config().get('setup_config') or {}
 
 	update_global_settings(_dict(config))
 
@@ -133,9 +134,8 @@
 
 @frappe.whitelist()
 def make_setup_docs(args, config=None):
-	# TODO: get from not site conf
 	if not config:
-		config = frappe.local.conf.setup or {}
+		config = get_journeys_config().get('setup_config') or {}
 
 	args = json.loads(args)