From 37e4c91ec231585e6da2e2bcd5d39f5f9a5092d0 Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Wed, 28 Oct 2020 11:25:16 +0530 Subject: [PATCH] fix: rename e_invoice_utils.py --- .../doctype/e_invoice_settings/e_invoice_settings.js | 2 +- .../doctype/e_invoice_settings/e_invoice_settings.py | 4 +++- erpnext/regional/india/e_invoice/einvoice.js | 10 +++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/erpnext/regional/doctype/e_invoice_settings/e_invoice_settings.js b/erpnext/regional/doctype/e_invoice_settings/e_invoice_settings.js index e9fb622b6b6..bea16ffa7fd 100644 --- a/erpnext/regional/doctype/e_invoice_settings/e_invoice_settings.js +++ b/erpnext/regional/doctype/e_invoice_settings/e_invoice_settings.js @@ -15,7 +15,7 @@ frappe.ui.form.on('E Invoice Settings', { frm.add_custom_button(__("Fetch Token"), () => { frm.call({ - method: 'erpnext.regional.india.e_invoice.e_invoice_utils.fetch_token', + method: 'erpnext.regional.india.e_invoice.utils.fetch_token', freeze: true, callback: () => frm.refresh() }); diff --git a/erpnext/regional/doctype/e_invoice_settings/e_invoice_settings.py b/erpnext/regional/doctype/e_invoice_settings/e_invoice_settings.py index e90d07edbd6..27f4a19b246 100644 --- a/erpnext/regional/doctype/e_invoice_settings/e_invoice_settings.py +++ b/erpnext/regional/doctype/e_invoice_settings/e_invoice_settings.py @@ -17,7 +17,9 @@ class EInvoiceSettings(Document): frappe.throw(_("{} is required").format(frappe.unscrub(d)), title=_("Missing Values")) def before_save(self): - if not self.public_key or self.has_value_changed('public_key_file'): + previous = self.get_doc_before_save() + public_file_changed = previous.get('public_key_file') != self.get('public_key_file') if previous else True + if not self.public_key or public_file_changed: self.public_key = self.read_key_file() def read_key_file(self): diff --git a/erpnext/regional/india/e_invoice/einvoice.js b/erpnext/regional/india/e_invoice/einvoice.js index b071919570d..e6fccbd7be4 100644 --- a/erpnext/regional/india/e_invoice/einvoice.js +++ b/erpnext/regional/india/e_invoice/einvoice.js @@ -123,13 +123,13 @@ erpnext.setup_einvoice_actions = (doctype) => { "Download E-Invoice", () => { frappe.call({ - method: 'erpnext.regional.india.e_invoice.e_invoice_utils.make_einvoice', + method: 'erpnext.regional.india.e_invoice.utils.make_einvoice', args: { doctype, name }, freeze: true, callback: (res) => { if (!res.exc) { const args = { - cmd: 'erpnext.regional.india.e_invoice.e_invoice_utils.download_einvoice', + cmd: 'erpnext.regional.india.e_invoice.utils.download_einvoice', einvoice: JSON.stringify([res.message]), name: name }; @@ -142,7 +142,7 @@ erpnext.setup_einvoice_actions = (doctype) => { "Upload Signed E-Invoice", () => { new frappe.ui.FileUploader({ - method: 'erpnext.regional.india.e_invoice.e_invoice_utils.upload_einvoice', + method: 'erpnext.regional.india.e_invoice.utils.upload_einvoice', allow_multiple: 0, doctype: doctype, docname: name, @@ -173,7 +173,7 @@ erpnext.setup_einvoice_actions = (doctype) => { primary_action: function() { const data = d.get_values(); const args = { - cmd: 'erpnext.regional.india.e_invoice.e_invoice_utils.download_cancel_einvoice', + cmd: 'erpnext.regional.india.e_invoice.utils.download_cancel_einvoice', irn: irn, reason: data.reason.split('-')[0], remark: data.remark, name: name }; open_url_post(frappe.request.url, args); @@ -188,7 +188,7 @@ erpnext.setup_einvoice_actions = (doctype) => { "Upload Cancel JSON", () => { new frappe.ui.FileUploader({ - method: 'erpnext.regional.india.e_invoice.e_invoice_utils.upload_cancel_ack', + method: 'erpnext.regional.india.e_invoice.utils.upload_cancel_ack', allow_multiple: 0, doctype: doctype, docname: name,