From ac4a5bfe6d5d08735dbf2745ca5f2ed7b138ea9d Mon Sep 17 00:00:00 2001
From: l0gesh29 <logeshperiyasamy24@gmail.com>
Date: Fri, 8 Aug 2025 14:20:25 +0530
Subject: [PATCH] fix: add fieldname in accounting dimension filter

(cherry picked from commit ac2acc535d9742622b1733dbe7f93db2a4450032)

# Conflicts:
#	erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json
---
 .../accounting_dimension_filter.json           | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json b/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json
index 2bd6c12a0a3..bee30296eed 100644
--- a/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json
+++ b/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json
@@ -7,6 +7,7 @@
  "engine": "InnoDB",
  "field_order": [
   "accounting_dimension",
+  "fieldname",
   "disabled",
   "column_break_2",
   "company",
@@ -90,11 +91,21 @@
    "fieldname": "apply_restriction_on_values",
    "fieldtype": "Check",
    "label": "Apply restriction on dimension values"
+  },
+  {
+   "fieldname": "fieldname",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "label": "Fieldname"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2023-06-07 14:59:41.869117",
+=======
+ "modified": "2025-08-08 14:13:22.203011",
+>>>>>>> ac2acc535d (fix: add fieldname in accounting dimension filter)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounting Dimension Filter",
@@ -139,8 +150,13 @@
   }
  ],
  "quick_entry": 1,
+<<<<<<< HEAD
  "sort_field": "modified",
+=======
+ "row_format": "Dynamic",
+ "sort_field": "creation",
+>>>>>>> ac2acc535d (fix: add fieldname in accounting dimension filter)
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
\ No newline at end of file
+}