commit 1aee75aadcbc81c947ab38f2c4f311fa7c8cdb40
author Prateeksha Singh <pratu16x7@gmail.com> Wed Nov 21 14:59:27 2018 +0530
committer Prateeksha Singh <pratu16x7@gmail.com> Wed Dec 12 21:29:55 2018 +0530
tree 41db6f17d19bc75a01d0147af4f1d9f7da63ae89
parent 8469b27c3ade600eeb2d03565afa1f1e5a7faf75

[setup] separate out setup_company

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 5fc707b..bf1a629 100644
--- a/erpnext/setup/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/setup_wizard/setup_wizard.py
@@ -134,14 +134,19 @@
 	fixtures.install(_dict(config).country)
 
 @frappe.whitelist()
-def make_setup_docs(args):
+def install_company(args):
 	config = get_journeys_config().get('setup_config') or {}
-
 	args = json.loads(args)
-
 	args.update(config)
 
 	fixtures.install_company(_dict(args))
+
+@frappe.whitelist()
+def setup_globals(args):
+	config = get_journeys_config().get('setup_config') or {}
+	args = json.loads(args)
+	args.update(config)
+
 	fixtures.install_defaults(_dict(args))
 	# setup_taxes(args)
 
@@ -150,7 +155,8 @@
 @frappe.whitelist()
 def setup(args, config=None):
 	install_fixtures()
-	make_setup_docs(args)
+	install_company(args)
+	setup_globals(args)
 
 
 @frappe.whitelist()