From f025628beb9ec8e8b9eef5b89d5731ff363460e5 Mon Sep 17 00:00:00 2001 From: Sanket322 Date: Thu, 23 Jan 2025 17:47:10 +0530 Subject: [PATCH 1/4] fix: Update Address button --- .../gst_india/client_scripts/address.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/india_compliance/gst_india/client_scripts/address.js b/india_compliance/gst_india/client_scripts/address.js index 15bdf124fc..915713b8e1 100644 --- a/india_compliance/gst_india/client_scripts/address.js +++ b/india_compliance/gst_india/client_scripts/address.js @@ -24,6 +24,8 @@ frappe.ui.form.on(DOCTYPE, { async refresh(frm) { india_compliance.set_state_options(frm); + update_address_info(frm); + // set default values for GST fields if (!frm.is_new() || !frm.doc.links || !frm.doc.links.length || frm.doc.gstin) return; @@ -52,3 +54,18 @@ frappe.ui.form.on(DOCTYPE, { frm.set_value("gst_category", doc.gst_category || ""); }, }); + +function update_address_info(frm) { + frm.add_custom_button(__("Update Address"), function () { + const doc = frappe.get_doc(DOCTYPE, frm.doc.name); + doc._gstin = frm.doc.gstin; + doc._pincode = frm.doc.pincode; + + const Address = frappe.ui.form.AddressQuickEntryForm; + frappe.ui.form.AddressQuickEntryForm = class extends frappe.ui.form.AddressQuickEntryForm { + get_dynamic_link_fields() { return []; } + } + frappe.ui.form.make_quick_entry(DOCTYPE,null,null,doc); + frappe.ui.form.AddressQuickEntryForm = Address; + }); +} \ No newline at end of file From e97263bac2c59c3b80c5a6ffbe8e6cab8c9b04be Mon Sep 17 00:00:00 2001 From: Sanket322 Date: Fri, 24 Jan 2025 13:11:58 +0530 Subject: [PATCH 2/4] fix: refresh fields after update --- .../gst_india/client_scripts/address.js | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/india_compliance/gst_india/client_scripts/address.js b/india_compliance/gst_india/client_scripts/address.js index 915713b8e1..2e6eff11a2 100644 --- a/india_compliance/gst_india/client_scripts/address.js +++ b/india_compliance/gst_india/client_scripts/address.js @@ -24,7 +24,7 @@ frappe.ui.form.on(DOCTYPE, { async refresh(frm) { india_compliance.set_state_options(frm); - update_address_info(frm); + frm.add_custom_button(__("Update Address"), () => update_address_fields(frm)); // set default values for GST fields if (!frm.is_new() || !frm.doc.links || !frm.doc.links.length || frm.doc.gstin) return; @@ -55,17 +55,18 @@ frappe.ui.form.on(DOCTYPE, { }, }); -function update_address_info(frm) { - frm.add_custom_button(__("Update Address"), function () { - const doc = frappe.get_doc(DOCTYPE, frm.doc.name); - doc._gstin = frm.doc.gstin; - doc._pincode = frm.doc.pincode; +function update_address_fields(frm) { + const doc = frappe.get_doc(DOCTYPE, frm.doc.name); + doc._gstin = frm.doc.gstin; + doc._pincode = frm.doc.pincode; - const Address = frappe.ui.form.AddressQuickEntryForm; - frappe.ui.form.AddressQuickEntryForm = class extends frappe.ui.form.AddressQuickEntryForm { - get_dynamic_link_fields() { return []; } - } - frappe.ui.form.make_quick_entry(DOCTYPE,null,null,doc); - frappe.ui.form.AddressQuickEntryForm = Address; - }); + const original_quick_entry_form = frappe.ui.form.AddressQuickEntryForm; + + frappe.ui.form.AddressQuickEntryForm = class extends frappe.ui.form.AddressQuickEntryForm { + get_dynamic_link_fields() { return []; } + update_doc() { frm.refresh(); } + } + frappe.ui.form.make_quick_entry(DOCTYPE, null, null, doc); + + frappe.ui.form.AddressQuickEntryForm = original_quick_entry_form; } \ No newline at end of file From 69dc82201418cbcc19784a8e57c0222f8fdf2284 Mon Sep 17 00:00:00 2001 From: Sanket322 Date: Fri, 31 Jan 2025 15:01:33 +0530 Subject: [PATCH 3/4] fix: update title of dialog --- india_compliance/gst_india/client_scripts/address.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/india_compliance/gst_india/client_scripts/address.js b/india_compliance/gst_india/client_scripts/address.js index 2e6eff11a2..d906a487f0 100644 --- a/india_compliance/gst_india/client_scripts/address.js +++ b/india_compliance/gst_india/client_scripts/address.js @@ -63,8 +63,13 @@ function update_address_fields(frm) { const original_quick_entry_form = frappe.ui.form.AddressQuickEntryForm; frappe.ui.form.AddressQuickEntryForm = class extends frappe.ui.form.AddressQuickEntryForm { + title = "Update Address" get_dynamic_link_fields() { return []; } - update_doc() { frm.refresh(); } + update_doc() { + const doc = super.update_doc(); + frm.refresh(); + return doc; + } } frappe.ui.form.make_quick_entry(DOCTYPE, null, null, doc); From e61fef9b6e05a8d7e3e263c6e6ae99e208ce6dd2 Mon Sep 17 00:00:00 2001 From: Sanket322 Date: Tue, 4 Feb 2025 19:32:09 +0530 Subject: [PATCH 4/4] fix: call api in onload --- india_compliance/gst_india/client_scripts/address.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/india_compliance/gst_india/client_scripts/address.js b/india_compliance/gst_india/client_scripts/address.js index d906a487f0..15e1586016 100644 --- a/india_compliance/gst_india/client_scripts/address.js +++ b/india_compliance/gst_india/client_scripts/address.js @@ -56,22 +56,22 @@ frappe.ui.form.on(DOCTYPE, { }); function update_address_fields(frm) { - const doc = frappe.get_doc(DOCTYPE, frm.doc.name); - doc._gstin = frm.doc.gstin; - doc._pincode = frm.doc.pincode; - const original_quick_entry_form = frappe.ui.form.AddressQuickEntryForm; frappe.ui.form.AddressQuickEntryForm = class extends frappe.ui.form.AddressQuickEntryForm { title = "Update Address" + get_dynamic_link_fields() { return []; } - update_doc() { + + update_doc(){ const doc = super.update_doc(); frm.refresh(); return doc; } } - frappe.ui.form.make_quick_entry(DOCTYPE, null, null, doc); + + const doc = frappe.get_doc(DOCTYPE, frm.doc.name); + frappe.ui.form.make_quick_entry(DOCTYPE, null, (dialog) => dialog.set_value("_gstin", frm.doc.gstin), doc); frappe.ui.form.AddressQuickEntryForm = original_quick_entry_form; } \ No newline at end of file