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

[fix] setup-wizard

Browse Source
This commit is contained in:
Rushabh Mehta 2017-07-20 15:55:54 +05:30
parent 51a76885b8
commit ced14cc789
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -236,7 +236,7 @@ var erpnext_slides = [
help: __("List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later."), help: __("List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later."),
add_more: 1, add_more: 1,
max_count: 3, max_count: 3,
mandatory_entry: 1, mandatory_entry: 0,
fields: [ fields: [
{fieldtype:"Section Break"}, {fieldtype:"Section Break"},
{fieldtype:"Data", fieldname:"tax", label:__("Tax"), {fieldtype:"Data", fieldname:"tax", label:__("Tax"),

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

@ -287,12 +287,9 @@ def make_tax_account_and_template(company, account_name, tax_rate, template_name
if accounts: if accounts:
make_sales_and_purchase_tax_templates(accounts, template_name) make_sales_and_purchase_tax_templates(accounts, template_name)
except frappe.NameError, e: except frappe.NameError:
if e.args[2][0]==1062: pass
pass except RootNotEditable:
else:
raise
except RootNotEditable, e:
pass pass
def get_tax_account_group(company): def get_tax_account_group(company):