From ced14cc78936e5393df627ee451c42c8214fd7b0 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 20 Jul 2017 15:55:54 +0530 Subject: [PATCH 1/3] [fix] setup-wizard --- erpnext/public/js/setup_wizard.js | 2 +- erpnext/setup/setup_wizard/setup_wizard.py | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/erpnext/public/js/setup_wizard.js b/erpnext/public/js/setup_wizard.js index cb48c2523b..016309833a 100644 --- a/erpnext/public/js/setup_wizard.js +++ b/erpnext/public/js/setup_wizard.js @@ -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."), add_more: 1, max_count: 3, - mandatory_entry: 1, + mandatory_entry: 0, fields: [ {fieldtype:"Section Break"}, {fieldtype:"Data", fieldname:"tax", label:__("Tax"), diff --git a/erpnext/setup/setup_wizard/setup_wizard.py b/erpnext/setup/setup_wizard/setup_wizard.py index 8b218dd5a2..4dec3d75f7 100644 --- a/erpnext/setup/setup_wizard/setup_wizard.py +++ b/erpnext/setup/setup_wizard/setup_wizard.py @@ -287,12 +287,9 @@ def make_tax_account_and_template(company, account_name, tax_rate, template_name if accounts: make_sales_and_purchase_tax_templates(accounts, template_name) - except frappe.NameError, e: - if e.args[2][0]==1062: - pass - else: - raise - except RootNotEditable, e: + except frappe.NameError: + pass + except RootNotEditable: pass def get_tax_account_group(company): From 35da7d1fb4844e55d72a3c82a8de8f0bdde2e02d Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 20 Jul 2017 15:58:20 +0530 Subject: [PATCH 2/3] [minor] we buy is also checked by default --- erpnext/public/js/setup_wizard.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/erpnext/public/js/setup_wizard.js b/erpnext/public/js/setup_wizard.js index 016309833a..29ef12ce3d 100644 --- a/erpnext/public/js/setup_wizard.js +++ b/erpnext/public/js/setup_wizard.js @@ -308,8 +308,10 @@ var erpnext_slides = [ options:[__("Unit"), __("Nos"), __("Box"), __("Pair"), __("Kg"), __("Set"), __("Hour"), __("Minute"), __("Litre"), __("Meter"), __("Gram")], "default": __("Unit"), static: 1}, - {fieldtype: "Check", fieldname: "is_sales_item", label:__("We sell this Item"), default: 1, static: 1}, - {fieldtype: "Check", fieldname: "is_purchase_item", label:__("We buy this Item"), static: 1}, + {fieldtype: "Check", fieldname: "is_sales_item", + label:__("We sell this Item"), default: 1, static: 1}, + {fieldtype: "Check", fieldname: "is_purchase_item", + label:__("We buy this Item"), default: 1, static: 1}, {fieldtype:"Column Break"}, {fieldtype:"Currency", fieldname:"item_price", label:__("Rate"), static: 1}, {fieldtype:"Attach Image", fieldname:"item_img", label:__("Attach Image"), is_private: 0, static: 1}, From ea50c9d1be2ee0ca6a3ed94dfaf7e111a0a8155b Mon Sep 17 00:00:00 2001 From: mbauskar Date: Thu, 20 Jul 2017 17:19:30 +0600 Subject: [PATCH 3/3] bumped to version 8.5.4 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index bbfb0f81fb..ccb71bcdce 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -4,7 +4,7 @@ import inspect import frappe from erpnext.hooks import regional_overrides -__version__ = '8.5.3' +__version__ = '8.5.4' def get_default_company(user=None): '''Get default company for user'''