Merge pull request #5652 from saurabh6790/V7_fixes_1
[fix] link fixes for tree structures #5651
diff --git a/erpnext/public/js/setup_wizard.js b/erpnext/public/js/setup_wizard.js
index 511925c..0228fa1 100644
--- a/erpnext/public/js/setup_wizard.js
+++ b/erpnext/public/js/setup_wizard.js
@@ -317,7 +317,11 @@
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 ffcac98..9d614dc 100644
--- a/erpnext/setup/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/setup_wizard/setup_wizard.py
@@ -20,7 +20,6 @@
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 @@
frappe.db.commit()
login_as_first_user(args)
+
frappe.db.commit()
frappe.clear_cache()
@@ -55,17 +55,6 @@
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 @@
'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 @@
'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()