Merge pull request #30900 from alyf-de/bank-account-website
feat: remove website from bank account
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py
index b83d6a5..c0005f7 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py
@@ -12,7 +12,10 @@
"Sales Invoice": "return_against",
"Auto Repeat": "reference_document",
},
- "internal_links": {"Sales Order": ["items", "sales_order"]},
+ "internal_links": {
+ "Sales Order": ["items", "sales_order"],
+ "Timesheet": ["timesheets", "time_sheet"],
+ },
"transactions": [
{
"label": _("Payment"),
diff --git a/erpnext/regional/india/e_invoice/utils.py b/erpnext/regional/india/e_invoice/utils.py
index df3981a..cfe9cee 100644
--- a/erpnext/regional/india/e_invoice/utils.py
+++ b/erpnext/regional/india/e_invoice/utils.py
@@ -443,7 +443,7 @@
dict(
gstin=invoice.gst_transporter_id,
name=invoice.transporter_name,
- mode_of_transport=mode_of_transport[invoice.mode_of_transport],
+ mode_of_transport=mode_of_transport[invoice.mode_of_transport or ""] or None,
distance=invoice.distance or 0,
document_name=invoice.lr_no,
document_date=format_date(invoice.lr_date, "dd/mm/yyyy"),
diff --git a/erpnext/setup/doctype/naming_series/naming_series.js b/erpnext/setup/doctype/naming_series/naming_series.js
index 7c76d9c..861b2b3 100644
--- a/erpnext/setup/doctype/naming_series/naming_series.js
+++ b/erpnext/setup/doctype/naming_series/naming_series.js
@@ -4,10 +4,13 @@
frappe.ui.form.on("Naming Series", {
onload: function(frm) {
- frm.disable_save();
frm.events.get_doc_and_prefix(frm);
},
+ refresh: function(frm) {
+ frm.disable_save();
+ },
+
get_doc_and_prefix: function(frm) {
frappe.call({
method: "get_transactions",
diff --git a/erpnext/tests/test_activation.py b/erpnext/tests/test_activation.py
new file mode 100644
index 0000000..b56e233
--- /dev/null
+++ b/erpnext/tests/test_activation.py
@@ -0,0 +1,9 @@
+from frappe.tests.utils import FrappeTestCase
+
+from erpnext.utilities.activation import get_level
+
+
+class TestActivation(FrappeTestCase):
+ def test_activation(self):
+ levels = get_level()
+ self.assertTrue(levels)
diff --git a/erpnext/utilities/activation.py b/erpnext/utilities/activation.py
index cd7910c..7b2df5e 100644
--- a/erpnext/utilities/activation.py
+++ b/erpnext/utilities/activation.py
@@ -18,7 +18,6 @@
"Customer": 5,
"Delivery Note": 5,
"Employee": 3,
- "Instructor": 5,
"Issue": 5,
"Item": 5,
"Journal Entry": 3,