Merge pull request #20505 from deepeshgarg007/button_shift
fix: Move E-Way bill button under create
diff --git a/erpnext/accounts/doctype/sales_invoice/regional/india.js b/erpnext/accounts/doctype/sales_invoice/regional/india.js
index 48fa364..ba6c03b 100644
--- a/erpnext/accounts/doctype/sales_invoice/regional/india.js
+++ b/erpnext/accounts/doctype/sales_invoice/regional/india.js
@@ -25,7 +25,7 @@
if(frm.doc.docstatus == 1 && !frm.is_dirty()
&& !frm.doc.is_return && !frm.doc.ewaybill) {
- frm.add_custom_button('e-Way Bill JSON', () => {
+ frm.add_custom_button('E-Way Bill JSON', () => {
var w = window.open(
frappe.urllib.get_full_url(
"/api/method/erpnext.regional.india.utils.generate_ewb_json?"
@@ -36,7 +36,7 @@
if (!w) {
frappe.msgprint(__("Please enable pop-ups")); return;
}
- }, __("Make"));
+ }, __("Create"));
}
}
diff --git a/erpnext/accounts/doctype/sales_invoice/regional/india_list.js b/erpnext/accounts/doctype/sales_invoice/regional/india_list.js
index 66d74b4..d175827 100644
--- a/erpnext/accounts/doctype/sales_invoice/regional/india_list.js
+++ b/erpnext/accounts/doctype/sales_invoice/regional/india_list.js
@@ -12,7 +12,7 @@
for (let doc of selected_docs) {
if (doc.docstatus !== 1) {
- frappe.throw(__("e-Way Bill JSON can only be generated from a submitted document"));
+ frappe.throw(__("E-Way Bill JSON can only be generated from a submitted document"));
}
}
@@ -29,5 +29,5 @@
};
- doclist.page.add_actions_menu_item(__('Generate e-Way Bill JSON'), action, false);
+ doclist.page.add_actions_menu_item(__('Generate E-Way Bill JSON'), action, false);
};
\ No newline at end of file
diff --git a/erpnext/regional/india/utils.py b/erpnext/regional/india/utils.py
index 3a187ba..266affb 100644
--- a/erpnext/regional/india/utils.py
+++ b/erpnext/regional/india/utils.py
@@ -358,7 +358,7 @@
def get_ewb_data(dt, dn):
if dt != 'Sales Invoice':
- frappe.throw(_('e-Way Bill JSON can only be generated from Sales Invoice'))
+ frappe.throw(_('E-Way Bill JSON can only be generated from Sales Invoice'))
dn = dn.split(',')
@@ -381,7 +381,7 @@
elif doc.gst_category in ['Overseas', 'Deemed Export']:
data.subSupplyType = 3
else:
- frappe.throw(_('Unsupported GST Category for e-Way Bill JSON generation'))
+ frappe.throw(_('Unsupported GST Category for E-Way Bill JSON generation'))
data.docType = 'INV'
data.docDate = frappe.utils.formatdate(doc.posting_date, 'dd/mm/yyyy')
@@ -537,10 +537,10 @@
def validate_sales_invoice(doc):
if doc.docstatus != 1:
- frappe.throw(_('e-Way Bill JSON can only be generated from submitted document'))
+ frappe.throw(_('E-Way Bill JSON can only be generated from submitted document'))
if doc.is_return:
- frappe.throw(_('e-Way Bill JSON cannot be generated for Sales Return as of now'))
+ frappe.throw(_('E-Way Bill JSON cannot be generated for Sales Return as of now'))
if doc.ewaybill:
frappe.throw(_('e-Way Bill already exists for this document'))
@@ -550,7 +550,7 @@
for fieldname in reqd_fields:
if not doc.get(fieldname):
- frappe.throw(_('{} is required to generate e-Way Bill JSON').format(
+ frappe.throw(_('{} is required to generate E-Way Bill JSON').format(
doc.meta.get_label(fieldname)
))