From aee804b0124ab3b815b5bded96ce014cf8cffc1c Mon Sep 17 00:00:00 2001
From: maharshivpatel <39730881+maharshivpatel@users.noreply.github.com>
Date: Tue, 17 May 2022 17:49:38 +0530
Subject: [PATCH 1/2] Critical Fix Eway Bill Cancel Api is Disabed
E-invoice API for E-way bill cancellation from Adaequare is permanently disabled on their production API.
---
erpnext/regional/india/e_invoice/einvoice.js | 67 ++++++--------------
erpnext/regional/india/e_invoice/utils.py | 15 +++--
2 files changed, 29 insertions(+), 53 deletions(-)
diff --git a/erpnext/regional/india/e_invoice/einvoice.js b/erpnext/regional/india/e_invoice/einvoice.js
index ea56d07d6dad..4748b265dc2b 100644
--- a/erpnext/regional/india/e_invoice/einvoice.js
+++ b/erpnext/regional/india/e_invoice/einvoice.js
@@ -149,58 +149,27 @@ erpnext.setup_einvoice_actions = (doctype) => {
}
if (irn && ewaybill && !irn_cancelled && !eway_bill_cancelled) {
- const fields = [
- {
- "label": "Reason",
- "fieldname": "reason",
- "fieldtype": "Select",
- "reqd": 1,
- "default": "1-Duplicate",
- "options": ["1-Duplicate", "2-Data Entry Error", "3-Order Cancelled", "4-Other"]
- },
- {
- "label": "Remark",
- "fieldname": "remark",
- "fieldtype": "Data",
- "reqd": 1
- }
- ];
const action = () => {
- const d = new frappe.ui.Dialog({
- title: __('Cancel E-Way Bill'),
- fields: fields,
- primary_action: function() {
- const data = d.get_values();
- frappe.call({
- method: 'erpnext.regional.india.e_invoice.utils.cancel_eway_bill',
- args: {
- doctype,
- docname: name,
- eway_bill: ewaybill,
- reason: data.reason.split('-')[0],
- remark: data.remark
- },
- freeze: true,
- callback: () => {
- frappe.show_alert({
- message: __('E-Way Bill Cancelled successfully'),
- indicator: 'green'
- }, 7);
- frm.reload_doc();
- d.hide();
- },
- error: () => {
- frappe.show_alert({
- message: __('E-Way Bill was not Cancelled'),
- indicator: 'red'
- }, 7);
- d.hide();
- }
- });
+ let message = __('Cancellation of e-way bill is currently not supported.') + ' ';
+ message += '
';
+ message += __('You must first use the portal to cancel the e-way bill and then update the cancelled status in the ERPNext system.');
+
+ const dialog = frappe.msgprint({
+ title: __('Update E-Way Bill Cancelled Status?'),
+ message: message,
+ indicator: 'orange',
+ primary_action: {
+ action: function() {
+ frappe.call({
+ method: 'erpnext.regional.india.e_invoice.utils.cancel_eway_bill',
+ args: { doctype, docname: name },
+ freeze: true,
+ callback: () => frm.reload_doc() && dialog.hide()
+ });
+ }
},
- primary_action_label: __('Submit')
+ primary_action_label: __('Yes')
});
- d.show();
};
add_custom_button(__("Cancel E-Way Bill"), action);
}
diff --git a/erpnext/regional/india/e_invoice/utils.py b/erpnext/regional/india/e_invoice/utils.py
index ed1002a129e2..19fb23121759 100644
--- a/erpnext/regional/india/e_invoice/utils.py
+++ b/erpnext/regional/india/e_invoice/utils.py
@@ -797,7 +797,9 @@ def __init__(self, doctype=None, docname=None):
self.irn_details_url = self.base_url + "/enriched/ei/api/invoice/irn"
self.generate_irn_url = self.base_url + "/enriched/ei/api/invoice"
self.gstin_details_url = self.base_url + "/enriched/ei/api/master/gstin"
- self.cancel_ewaybill_url = self.base_url + "/enriched/ei/api/ewayapi"
+ self.cancel_ewaybill_url = (
+ self.base_url + "/enriched/ewb/ewayapi?action=CANEWB"
+ ) # this will only work if user have bought ewb api from adaequare.
self.generate_ewaybill_url = self.base_url + "/enriched/ei/api/ewaybill"
self.get_qrcode_url = self.base_url + "/enriched/ei/others/qr/image"
@@ -1185,6 +1187,7 @@ def cancel_eway_bill(self, eway_bill, reason, remark):
headers = self.get_headers()
data = json.dumps({"ewbNo": eway_bill, "cancelRsnCode": reason, "cancelRmrk": remark}, indent=4)
headers["username"] = headers["user_name"]
+ del headers["user_name"]
try:
res = self.make_request("post", self.cancel_ewaybill_url, headers, data)
if res.get("success"):
@@ -1358,9 +1361,13 @@ def generate_eway_bill(doctype, docname, **kwargs):
@frappe.whitelist()
-def cancel_eway_bill(doctype, docname, eway_bill, reason, remark):
- gsp_connector = GSPConnector(doctype, docname)
- gsp_connector.cancel_eway_bill(eway_bill, reason, remark)
+def cancel_eway_bill(doctype, docname):
+ # NOTE: cancel_eway_bill api is disabled by Adequare.
+ # gsp_connector = GSPConnector(doctype, docname)
+ # gsp_connector.cancel_eway_bill(eway_bill, reason, remark)
+
+ frappe.db.set_value(doctype, docname, "ewaybill", "")
+ frappe.db.set_value(doctype, docname, "eway_bill_cancelled", 1)
@frappe.whitelist()
From b9da04b2bb3c613e451457e065d973c5275cb26e Mon Sep 17 00:00:00 2001
From: maharshivpatel <39730881+maharshivpatel@users.noreply.github.com>
Date: Tue, 17 May 2022 18:01:58 +0530
Subject: [PATCH 2/2] fix: linter
---
erpnext/regional/india/e_invoice/utils.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/erpnext/regional/india/e_invoice/utils.py b/erpnext/regional/india/e_invoice/utils.py
index 19fb23121759..7cc636e478e3 100644
--- a/erpnext/regional/india/e_invoice/utils.py
+++ b/erpnext/regional/india/e_invoice/utils.py
@@ -797,9 +797,8 @@ def __init__(self, doctype=None, docname=None):
self.irn_details_url = self.base_url + "/enriched/ei/api/invoice/irn"
self.generate_irn_url = self.base_url + "/enriched/ei/api/invoice"
self.gstin_details_url = self.base_url + "/enriched/ei/api/master/gstin"
- self.cancel_ewaybill_url = (
- self.base_url + "/enriched/ewb/ewayapi?action=CANEWB"
- ) # this will only work if user have bought ewb api from adaequare.
+ # cancel_ewaybill_url will only work if user have bought ewb api from adaequare.
+ self.cancel_ewaybill_url = self.base_url + "/enriched/ewb/ewayapi?action=CANEWB"
self.generate_ewaybill_url = self.base_url + "/enriched/ei/api/ewaybill"
self.get_qrcode_url = self.base_url + "/enriched/ei/others/qr/image"