commit c1c057611e2bdc7a27555f070a8ee89f943e5a16
author Prateeksha Singh <pratu16x7@gmail.com> Wed Nov 14 10:26:58 2018 +0530
committer Prateeksha Singh <pratu16x7@gmail.com> Wed Dec 12 21:29:54 2018 +0530
tree 381543862f58e1733e9ae44ac4b26934674b3866
parent dabf349599efa7f83193b9b49eda771a9752eb7b

[setup] bundle up fixtures and setup docs

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 0856689..3ecd00a 100644
--- a/erpnext/setup/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/setup_wizard/setup_wizard.py
@@ -124,18 +124,16 @@
 		frappe.local.login_manager.login_as(args.get("email"))
 
 @frappe.whitelist()
-def install_fixtures(config=None):
-	if not config:
-		config = get_journeys_config().get('setup_config') or {}
+def install_fixtures():
+	config = get_journeys_config().get('setup_config') or {}
 
 	update_global_settings(_dict(config))
 
 	fixtures.install(_dict(config).country)
 
 @frappe.whitelist()
-def make_setup_docs(args, config=None):
-	if not config:
-		config = get_journeys_config().get('setup_config') or {}
+def make_setup_docs(args):
+	config = get_journeys_config().get('setup_config') or {}
 
 	args = json.loads(args)
 
@@ -146,6 +144,10 @@
 
 	run_post_setup_complete(args)
 
+@frappe.whitelist()
+def setup(args, config=None):
+	install_fixtures()
+	make_setup_docs(args)
 
 def get_fy_details(fy_start_date, fy_end_date):
 	start_year = getdate(fy_start_date).year