From 9c5676292cc3705e89bec9c7be44b55a83ef029f Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Wed, 12 Dec 2018 13:47:43 +0530 Subject: [PATCH] [setup] add defaults stage --- erpnext/setup/setup_wizard/setup_wizard.py | 33 ++++++++++++++++------ 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/erpnext/setup/setup_wizard/setup_wizard.py b/erpnext/setup/setup_wizard/setup_wizard.py index b91c9a966df..e062e280b9d 100644 --- a/erpnext/setup/setup_wizard/setup_wizard.py +++ b/erpnext/setup/setup_wizard/setup_wizard.py @@ -60,6 +60,16 @@ def get_setup_stages(args=None): 'fn': setup_post_company_fixtures, 'args': args, 'fail_msg': _("Failed to setup post company fixtures") + }, + { + 'fn': setup_defaults, + 'args': args, + 'fail_msg': _("Failed to setup defaults") + }, + { + 'fn': stage_four, + 'args': args, + 'fail_msg': _("Failed to create website") } ] }, @@ -78,15 +88,6 @@ def get_setup_stages(args=None): return stages -def setup_complete(args=None): - stage_fixtures(args) - setup_company(args) - setup_taxes(args) - setup_post_company_fixtures(args) - fixtures.install_defaults(args) - stage_four(args) - fin(args) - def stage_fixtures(args): fixtures.install(args.get('country')) @@ -99,6 +100,9 @@ def setup_taxes(args): def setup_post_company_fixtures(args): fixtures.install_post_company_fixtures(args) +def setup_defaults(args): + fixtures.install_defaults(frappe._dict(args)) + def stage_four(args): company_setup.create_website(args) company_setup.create_email_digest() @@ -122,3 +126,14 @@ def make_sample_data(domains): def login_as_first_user(args): if args.get("email") and hasattr(frappe.local, "login_manager"): frappe.local.login_manager.login_as(args.get("email")) + + +# Only for programmatical use +def setup_complete(args=None): + stage_fixtures(args) + setup_company(args) + setup_taxes(args) + setup_post_company_fixtures(args) + setup_defaults(args) + stage_four(args) + fin(args)