From 1c4f6191cfca19c463de3cd7847f4ebf0c1b772e Mon Sep 17 00:00:00 2001 From: Smit Vora Date: Sat, 30 Dec 2023 11:31:59 +0530 Subject: [PATCH 1/2] fix: enqueue company tax setup in setup wizard --- india_compliance/public/js/setup_wizard.js | 19 ++++++++++++++++--- india_compliance/setup_wizard.py | 20 +++++--------------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/india_compliance/public/js/setup_wizard.js b/india_compliance/public/js/setup_wizard.js index 2e4ccd1b7..b7c9c7e6a 100644 --- a/india_compliance/public/js/setup_wizard.js +++ b/india_compliance/public/js/setup_wizard.js @@ -20,8 +20,21 @@ function update_erpnext_slides_settings() { fieldname: "default_gst_rate", fieldtype: "Select", label: __("Default GST Rate"), - options: [0.0, 0.1, 0.25, 1.0, 1.5, 3.0, 5.0, 6.0, 7.5, 12.0, 18.0, 28.0], - default: 18.0, + options: [ + "0.0", + "0.1", + "0.25", + "1.0", + "1.5", + "3.0", + "5.0", + "6.0", + "7.5", + "12.0", + "18.0", + "28.0", + ], + default: "18.0", }); slide.fields.push({ @@ -56,7 +69,7 @@ async function autofill_company_info(slide) { if (gstin_info.business_name) { await slide.get_field("company_name").set_value(gstin_info.business_name); - slide.get_input("company_name").trigger("change"); + slide.get_input("company_name").trigger("input"); } set_gstin_description(gstin_field, gstin_info.status); diff --git a/india_compliance/setup_wizard.py b/india_compliance/setup_wizard.py index e425178cc..817c8d289 100644 --- a/india_compliance/setup_wizard.py +++ b/india_compliance/setup_wizard.py @@ -28,23 +28,12 @@ def get_setup_wizard_stages(params=None): }, { "status": _("Wrapping up"), - "fail_msg": _("Failed to Update Company GSTIN"), + "fail_msg": _("Failed to Setup Company Taxes"), "tasks": [ { - "fn": setup_company_gstin_details, + "fn": setup_company_taxes, "args": params, - "fail_msg": _("Failed to Update Company GSTIN"), - } - ], - }, - { - "status": _("Wrapping up"), - "fail_msg": _("Failed to Create Tax Template"), - "tasks": [ - { - "fn": setup_tax_template, - "args": params, - "fail_msg": _("Failed to Create Tax Template"), + "fail_msg": _("Failed to Setup Company Taxes"), } ], }, @@ -59,7 +48,7 @@ def configure_audit_trail(params): enable_audit_trail() -def setup_company_gstin_details(params): +def setup_company_taxes(params): if not params.company_gstin: return @@ -72,6 +61,7 @@ def setup_company_gstin_details(params): update_company_info(params, gstin_info.gst_category) create_address(gstin_info, params) + setup_tax_template(params) def update_company_info(params, gst_category=None): From b7f00dea42f23874077cacf120ce4ea15dd33ab4 Mon Sep 17 00:00:00 2001 From: Smit Vora Date: Sat, 30 Dec 2023 21:45:08 +0530 Subject: [PATCH 2/2] fix: remove duplicate check after refactor --- india_compliance/setup_wizard.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/india_compliance/setup_wizard.py b/india_compliance/setup_wizard.py index 817c8d289..af7d1fba3 100644 --- a/india_compliance/setup_wizard.py +++ b/india_compliance/setup_wizard.py @@ -101,9 +101,6 @@ def can_fetch_gstin_info(): def setup_tax_template(params): - if not (params.company_name and frappe.db.exists("Company", params.company_name)): - return - if not params.default_gst_rate: params.default_gst_rate = "18.0"