From 317713865552a888a381d9f77a43b465d771437a Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 5 Jul 2016 21:34:21 +0530 Subject: [PATCH] [fix] moved disable setup wizard access to frappe --- erpnext/public/js/setup_wizard.js | 6 +++++- erpnext/setup/setup_wizard/setup_wizard.py | 23 ++++++---------------- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/erpnext/public/js/setup_wizard.js b/erpnext/public/js/setup_wizard.js index 511925c69db..0228fa19397 100644 --- a/erpnext/public/js/setup_wizard.js +++ b/erpnext/public/js/setup_wizard.js @@ -317,7 +317,11 @@ frappe.wiz.on("before_load", function() { load_erpnext_slides(); frappe.wiz.add_slide(erpnext.wiz.org); frappe.wiz.add_slide(erpnext.wiz.branding); - frappe.wiz.add_slide(erpnext.wiz.users); + + if (!(frappe.boot.limits && frappe.boot.limits.users===1)) { + frappe.wiz.add_slide(erpnext.wiz.users); + } + frappe.wiz.add_slide(erpnext.wiz.taxes); frappe.wiz.add_slide(erpnext.wiz.customers); frappe.wiz.add_slide(erpnext.wiz.suppliers); diff --git a/erpnext/setup/setup_wizard/setup_wizard.py b/erpnext/setup/setup_wizard/setup_wizard.py index ffcac985ce7..9d614dc433b 100644 --- a/erpnext/setup/setup_wizard/setup_wizard.py +++ b/erpnext/setup/setup_wizard/setup_wizard.py @@ -20,7 +20,6 @@ def setup_complete(args=None): install_fixtures.install(args.get("country")) - update_setup_wizard_access() create_price_lists(args) create_fiscal_year_and_company(args) create_users(args) @@ -41,6 +40,7 @@ def setup_complete(args=None): frappe.db.commit() login_as_first_user(args) + frappe.db.commit() frappe.clear_cache() @@ -55,17 +55,6 @@ def setup_complete(args=None): pass -def update_setup_wizard_access(): - if frappe.flags.in_test: - return - setup_wizard = frappe.get_doc('Page', 'setup-wizard') - for roles in setup_wizard.roles: - if roles.role == 'System Manager': - roles.role = 'Administrator' - setup_wizard.flags.ignore_permissions = 1 - setup_wizard.flags.do_not_update_json = 1 - setup_wizard.save() - def create_fiscal_year_and_company(args): if (args.get('fy_start_date')): curr_fiscal_year = get_fy_details(args.get('fy_start_date'), args.get('fy_end_date')) @@ -88,13 +77,13 @@ def create_fiscal_year_and_company(args): 'chart_of_accounts': args.get(('chart_of_accounts')), 'domain': args.get('domain') }).insert() - + #Enable shopping cart enable_shopping_cart(args) - + # Bank Account create_bank_account(args) - + def enable_shopping_cart(args): frappe.get_doc({ "doctype": "Shopping Cart Settings", @@ -103,8 +92,8 @@ def enable_shopping_cart(args): 'price_list': frappe.db.get_value("Price List", {"selling": 1}), 'default_customer_group': _("Individual"), 'quotation_series': "QTN-", - }).insert() - + }).insert() + def create_bank_account(args): if args.get("bank_account"): company_name = args.get('company_name').strip()