nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-28 14:18:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(accounts): opt-in 'Consider Accounting Dimension' filter on General Ledger Report (backport #58156) (#58158)

Browse Source
This commit is contained in:
mergify[bot]
2026-08-14 08:25:09 +00:00
committed by GitHub
parent f03b7ba40b
commit f8c3270049
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/accounts/doctype/accounts_settings/accounts_settings.json
View File

@@ -94,13 +94,14 @@
"column_break_25", "column_break_25",
"reports_tab", "reports_tab",
"remarks_section", "remarks_section",
"general_ledger_remarks_length", "disable_include_dimensions",
"receivable_payable_remarks_length",
"column_break_lvjk", "column_break_lvjk",
"general_ledger_remarks_length",
"accounts_receivable_payable_tuning_section", "accounts_receivable_payable_tuning_section",
"receivable_payable_fetch_method", "receivable_payable_fetch_method",
"default_ageing_range", "default_ageing_range",
"column_break_ntmi", "column_break_ntmi",
"receivable_payable_remarks_length",
"legacy_section", "legacy_section",
"ignore_is_opening_check_for_reporting", "ignore_is_opening_check_for_reporting",
"tab_break_dpet", "tab_break_dpet",
@@ -476,7 +477,7 @@
{ {
"fieldname": "remarks_section", "fieldname": "remarks_section",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Remarks Column Length" "label": "General Ledger Report"
}, },
{ {
"default": "0", "default": "0",
@@ -550,7 +551,7 @@
{ {
"fieldname": "accounts_receivable_payable_tuning_section", "fieldname": "accounts_receivable_payable_tuning_section",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Accounts Receivable / Payable Tuning" "label": "Accounts Receivable / Payable Report"
}, },
{ {
"fieldname": "legacy_section", "fieldname": "legacy_section",
@@ -782,6 +783,12 @@
"fieldname": "book_stock_expense_gl_entries", "fieldname": "book_stock_expense_gl_entries",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Book Stock Expense GL Entries" "label": "Book Stock Expense GL Entries"
},
{
"default": "0",
"fieldname": "disable_include_dimensions",
"fieldtype": "Check",
"label": "Disable \"Consider Accounting Dimension\" Filter"
} }
], ],
"grid_page_length": 50, "grid_page_length": 50,
@@ -790,7 +797,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2026-08-13 14:48:13.211701", "modified": "2026-08-14 13:12:47.895908",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Accounts Settings", "name": "Accounts Settings",

1
erpnext/accounts/doctype/accounts_settings/accounts_settings.py
View File

@@ -72,6 +72,7 @@ class AccountsSettings(Document):
default_ageing_range: DF.Data | None default_ageing_range: DF.Data | None
delete_linked_ledger_entries: DF.Check delete_linked_ledger_entries: DF.Check
determine_address_tax_category_from: DF.Literal["Billing Address", "Shipping Address"] determine_address_tax_category_from: DF.Literal["Billing Address", "Shipping Address"]
disable_include_dimensions: DF.Check
enable_accounting_dimensions: DF.Check enable_accounting_dimensions: DF.Check
enable_common_party_accounting: DF.Check enable_common_party_accounting: DF.Check
enable_discounts_and_margin: DF.Check enable_discounts_and_margin: DF.Check

2
erpnext/accounts/report/general_ledger/general_ledger.js
View File

@@ -175,7 +175,7 @@ frappe.query_reports["General Ledger"] = {
fieldname: "include_dimensions", fieldname: "include_dimensions",
label: __("Consider Accounting Dimensions"), label: __("Consider Accounting Dimensions"),
fieldtype: "Check", fieldtype: "Check",
default: 1, default: frappe.boot.sysdefaults.disable_include_dimensions ? 0 : 1,
}, },
{ {
fieldname: "disable_opening_balance_calculation", fieldname: "disable_opening_balance_calculation",

3
erpnext/startup/boot.py
View File

@@ -24,6 +24,9 @@ def boot_session(bootinfo):
bootinfo.sysdefaults.over_billing_allowance = frappe.get_single_value( bootinfo.sysdefaults.over_billing_allowance = frappe.get_single_value(
"Accounts Settings", "over_billing_allowance" "Accounts Settings", "over_billing_allowance"
) )
bootinfo.sysdefaults.disable_include_dimensions = cint(
frappe.get_single_value("Accounts Settings", "disable_include_dimensions")
)
bootinfo.sysdefaults.quotation_valid_till = cint( bootinfo.sysdefaults.quotation_valid_till = cint(
frappe.db.get_single_value("CRM Settings", "default_valid_till") frappe.db.get_single_value("CRM Settings", "default_valid_till")