mirror of
https://github.com/frappe/erpnext.git
synced 2026-03-22 11:44:11 +00:00
fix: add fieldname in accounting dimension filter
(cherry picked from commit ac2acc535d)
# Conflicts:
# erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json
This commit is contained in:
@@ -7,6 +7,7 @@
|
|||||||
"engine": "InnoDB",
|
"engine": "InnoDB",
|
||||||
"field_order": [
|
"field_order": [
|
||||||
"accounting_dimension",
|
"accounting_dimension",
|
||||||
|
"fieldname",
|
||||||
"disabled",
|
"disabled",
|
||||||
"column_break_2",
|
"column_break_2",
|
||||||
"company",
|
"company",
|
||||||
@@ -90,11 +91,21 @@
|
|||||||
"fieldname": "apply_restriction_on_values",
|
"fieldname": "apply_restriction_on_values",
|
||||||
"fieldtype": "Check",
|
"fieldtype": "Check",
|
||||||
"label": "Apply restriction on dimension values"
|
"label": "Apply restriction on dimension values"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "fieldname",
|
||||||
|
"fieldtype": "Data",
|
||||||
|
"hidden": 1,
|
||||||
|
"label": "Fieldname"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"index_web_pages_for_search": 1,
|
"index_web_pages_for_search": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
|
<<<<<<< HEAD
|
||||||
"modified": "2023-06-07 14:59:41.869117",
|
"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",
|
"modified_by": "Administrator",
|
||||||
"module": "Accounts",
|
"module": "Accounts",
|
||||||
"name": "Accounting Dimension Filter",
|
"name": "Accounting Dimension Filter",
|
||||||
@@ -139,7 +150,12 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"quick_entry": 1,
|
"quick_entry": 1,
|
||||||
|
<<<<<<< HEAD
|
||||||
"sort_field": "modified",
|
"sort_field": "modified",
|
||||||
|
=======
|
||||||
|
"row_format": "Dynamic",
|
||||||
|
"sort_field": "creation",
|
||||||
|
>>>>>>> ac2acc535d (fix: add fieldname in accounting dimension filter)
|
||||||
"sort_order": "DESC",
|
"sort_order": "DESC",
|
||||||
"states": [],
|
"states": [],
|
||||||
"track_changes": 1
|
"track_changes": 1
|
||||||
|
|||||||
Reference in New Issue
Block a user