From c70282663c69955d49ce41c772056cfe02bae975 Mon Sep 17 00:00:00 2001 From: ljain112 Date: Wed, 23 Oct 2024 18:13:42 +0530 Subject: [PATCH 1/2] fix: scrub "-" from fieldname in accounting dimension (cherry picked from commit 023b7b9a606483de52caf21bb9dad9f1d18c65bd) --- .../doctype/accounting_dimension/accounting_dimension.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.js b/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.js index 4e45dede1d5..6f4f9f8d782 100644 --- a/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.js +++ b/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.js @@ -58,7 +58,7 @@ frappe.ui.form.on("Accounting Dimension", { }, label: function (frm) { - frm.set_value("fieldname", frappe.model.scrub(frm.doc.label)); + frm.set_value("fieldname", frm.doc.label.replace(/ /g, "_").replace(/-/g, "_").toLowerCase()); }, document_type: function (frm) { From b21abf4d9056496f016c9aedf0182bb8dff7688d Mon Sep 17 00:00:00 2001 From: ljain112 Date: Wed, 23 Oct 2024 18:14:30 +0530 Subject: [PATCH 2/2] fix: validate fieldname (cherry picked from commit ca31a19eb7da1fa7fb9295911662fb55c14754a2) --- .../doctype/accounting_dimension/accounting_dimension.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py b/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py index db99bcd223b..8fc22dd7650 100644 --- a/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py +++ b/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py @@ -7,6 +7,7 @@ import json import frappe from frappe import _, scrub from frappe.custom.doctype.custom_field.custom_field import create_custom_field +from frappe.database.schema import validate_column_name from frappe.model import core_doctypes_list from frappe.model.document import Document from frappe.utils import cstr @@ -60,6 +61,7 @@ class AccountingDimension(Document): if not self.is_new(): self.validate_document_type_change() + validate_column_name(self.fieldname) self.validate_dimension_defaults() def validate_document_type_change(self):