CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-25 14:11:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: group e-invoicing actions

Browse Source
This commit is contained in:
Saqib Ansari
2020-10-07 11:07:11 +05:30
committed by Saurabh
parent acc79f739b
commit 94db0bba44
2 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
erpnext/regional/india/e_invoice_utils.py
View File

@@ -464,7 +464,7 @@ def make_e_invoice(doctype, name):
else:
frappe.throw(_("{}").format(error_msgs[0]), title=_("E Invoice Validation Failed"))
return {'einvoice': json.dumps(e_invoice)}
return {'einvoice': json.dumps([e_invoice])}
def validate_einvoice(validations, e_invoice, error_msgs=[]):
type_map = {
@@ -549,9 +549,18 @@ def download_cancel_einvoice():
reason = data['reason']
remark = data['remark']
cancel_einvoice = json.dumps(dict(Irn=irn, CnlRsn=reason, CnlRem=remark))
cancel_einvoice = json.dumps([dict(Irn=irn, CnlRsn=reason, CnlRem=remark)])
frappe.response['filename'] = "Cancel E-Invoice " + name + ".json"
frappe.response['filecontent'] = cancel_einvoice
frappe.response['content_type'] = 'application/json'
frappe.response['type'] = 'download'
frappe.response['type'] = 'download'
@frappe.whitelist()
def download_cancel_ack():
cancel_ack = json.loads(frappe.local.uploaded_file)
data = frappe._dict(frappe.local.form_dict)
doctype = data['doctype']
name = data['docname']
frappe.db.set_value(doctype, name, "irn_cancelled", 1)

26
erpnext/regional/india/einvoice.js
View File

@@ -112,10 +112,7 @@ erpnext.setup_einvoice_actions = (doctype) => {
}
}
})
}
);
}
if (frm.doc.docstatus == 0 && !frm.doc.irn && !frm.doc.__unsaved) {
}, "E-Invoicing");
frm.add_custom_button(
"Upload Signed E-Invoice",
() => {
@@ -130,8 +127,7 @@ erpnext.setup_einvoice_actions = (doctype) => {
}
}
});
}
);
}, "E-Invoicing");
}
if (frm.doc.docstatus == 1 && frm.doc.irn && !frm.doc.irn_cancelled) {
frm.add_custom_button(
@@ -161,8 +157,22 @@ erpnext.setup_einvoice_actions = (doctype) => {
primary_action_label: __('Download JSON')
});
d.show();
}
);
}, "E-Invoicing");
frm.add_custom_button(
"Upload Cancel JSON",
() => {
new frappe.ui.FileUploader({
method: 'erpnext.regional.india.e_invoice_utils.download_cancel_ack',
allow_multiple: 0,
doctype: frm.doc.doctype,
docname: frm.doc.name,
on_success: (attachment, r) => {
if (!r.exc) {
frm.reload_doc();
}
}
});
}, "E-Invoicing");
}
}
})