schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix] moved disable setup wizard access to frappe

Browse Source
This commit is contained in:
Anand Doshi
2016-07-05 21:34:21 +05:30
parent a86c5b196f
commit 3177138655
2 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/public/js/setup_wizard.js
View File

@@ -317,7 +317,11 @@ frappe.wiz.on("before_load", function() {
load_erpnext_slides(); load_erpnext_slides();
frappe.wiz.add_slide(erpnext.wiz.org); frappe.wiz.add_slide(erpnext.wiz.org);
frappe.wiz.add_slide(erpnext.wiz.branding); 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.taxes);
frappe.wiz.add_slide(erpnext.wiz.customers); frappe.wiz.add_slide(erpnext.wiz.customers);
frappe.wiz.add_slide(erpnext.wiz.suppliers); frappe.wiz.add_slide(erpnext.wiz.suppliers);

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

@@ -20,7 +20,6 @@ def setup_complete(args=None):
install_fixtures.install(args.get("country")) install_fixtures.install(args.get("country"))
update_setup_wizard_access()
create_price_lists(args) create_price_lists(args)
create_fiscal_year_and_company(args) create_fiscal_year_and_company(args)
create_users(args) create_users(args)
@@ -41,6 +40,7 @@ def setup_complete(args=None):
frappe.db.commit() frappe.db.commit()
login_as_first_user(args) login_as_first_user(args)
frappe.db.commit() frappe.db.commit()
frappe.clear_cache() frappe.clear_cache()
@@ -55,17 +55,6 @@ def setup_complete(args=None):
pass 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): def create_fiscal_year_and_company(args):
if (args.get('fy_start_date')): if (args.get('fy_start_date')):
curr_fiscal_year = get_fy_details(args.get('fy_start_date'), args.get('fy_end_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')), 'chart_of_accounts': args.get(('chart_of_accounts')),
'domain': args.get('domain') 'domain': args.get('domain')
}).insert() }).insert()
#Enable shopping cart #Enable shopping cart
enable_shopping_cart(args) enable_shopping_cart(args)
# Bank Account # Bank Account
create_bank_account(args) create_bank_account(args)
def enable_shopping_cart(args): def enable_shopping_cart(args):
frappe.get_doc({ frappe.get_doc({
"doctype": "Shopping Cart Settings", "doctype": "Shopping Cart Settings",
@@ -103,8 +92,8 @@ def enable_shopping_cart(args):
'price_list': frappe.db.get_value("Price List", {"selling": 1}), 'price_list': frappe.db.get_value("Price List", {"selling": 1}),
'default_customer_group': _("Individual"), 'default_customer_group': _("Individual"),
'quotation_series': "QTN-", 'quotation_series': "QTN-",
}).insert() }).insert()
def create_bank_account(args): def create_bank_account(args):
if args.get("bank_account"): if args.get("bank_account"):
company_name = args.get('company_name').strip() company_name = args.get('company_name').strip()