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

[setup] separate out setup_company

Browse Source
This commit is contained in:
Prateeksha Singh 2018-11-21 14:59:27 +05:30
parent 8469b27c3a
commit 1aee75aadc
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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