nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-19 21:19:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: rename e_invoice_utils.py

Browse Source
This commit is contained in:
Saqib Ansari
2020-10-28 11:25:16 +05:30
parent 12d9bc3787
commit 37e4c91ec2
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/regional/doctype/e_invoice_settings/e_invoice_settings.js
View File

@@ -15,7 +15,7 @@ frappe.ui.form.on('E Invoice Settings', {
frm.add_custom_button(__("Fetch Token"), frm.add_custom_button(__("Fetch Token"),
() => { () => {
frm.call({ frm.call({
method: 'erpnext.regional.india.e_invoice.e_invoice_utils.fetch_token', method: 'erpnext.regional.india.e_invoice.utils.fetch_token',
freeze: true, freeze: true,
callback: () => frm.refresh() callback: () => frm.refresh()
}); });

4
erpnext/regional/doctype/e_invoice_settings/e_invoice_settings.py
View File

@@ -17,7 +17,9 @@ class EInvoiceSettings(Document):
frappe.throw(_("{} is required").format(frappe.unscrub(d)), title=_("Missing Values")) frappe.throw(_("{} is required").format(frappe.unscrub(d)), title=_("Missing Values"))
def before_save(self): 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() self.public_key = self.read_key_file()
def read_key_file(self): def read_key_file(self):

10
erpnext/regional/india/e_invoice/einvoice.js
View File

@@ -123,13 +123,13 @@ erpnext.setup_einvoice_actions = (doctype) => {
"Download E-Invoice", "Download E-Invoice",
() => { () => {
frappe.call({ 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 }, args: { doctype, name },
freeze: true, freeze: true,
callback: (res) => { callback: (res) => {
if (!res.exc) { if (!res.exc) {
const args = { 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]), einvoice: JSON.stringify([res.message]),
name: name name: name
}; };
@@ -142,7 +142,7 @@ erpnext.setup_einvoice_actions = (doctype) => {
"Upload Signed E-Invoice", "Upload Signed E-Invoice",
() => { () => {
new frappe.ui.FileUploader({ 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, allow_multiple: 0,
doctype: doctype, doctype: doctype,
docname: name, docname: name,
@@ -173,7 +173,7 @@ erpnext.setup_einvoice_actions = (doctype) => {
primary_action: function() { primary_action: function() {
const data = d.get_values(); const data = d.get_values();
const args = { 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 irn: irn, reason: data.reason.split('-')[0], remark: data.remark, name: name
}; };
open_url_post(frappe.request.url, args); open_url_post(frappe.request.url, args);
@@ -188,7 +188,7 @@ erpnext.setup_einvoice_actions = (doctype) => {
"Upload Cancel JSON", "Upload Cancel JSON",
() => { () => {
new frappe.ui.FileUploader({ 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, allow_multiple: 0,
doctype: doctype, doctype: doctype,
docname: name, docname: name,