nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-05 13:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: aggregate child cost center data in Budget Variance Report

Browse Source
This commit is contained in:
khushi8112
2026-06-03 01:56:00 +05:30
parent 85be72a403
commit cd7fa56ec4
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
erpnext/accounts/report/budget_variance_report/budget_variance_report.py
View File

@@ -19,6 +19,8 @@ def execute(filters=None):
columns = get_columns(filters) columns = get_columns(filters)
if filters.get("budget_against_filter"): if filters.get("budget_against_filter"):
dimensions = filters.get("budget_against_filter") dimensions = filters.get("budget_against_filter")
if filters.get("budget_against") == "Cost Center":
dimensions = get_cost_center_with_children(dimensions)
else: else:
dimensions = get_budget_dimensions(filters) dimensions = get_budget_dimensions(filters)
if not dimensions: if not dimensions:
@@ -121,6 +123,7 @@ def build_budget_map(budget_records, filters):
def get_actual_transactions(dimension_name, filters): def get_actual_transactions(dimension_name, filters):
budget_against = frappe.scrub(filters.get("budget_against")) budget_against = frappe.scrub(filters.get("budget_against"))
cost_center_filter = "" cost_center_filter = ""
budget_gl_dimension_join = f"and b.{budget_against} = gl.{budget_against}"
if filters.get("budget_against") == "Cost Center" and dimension_name: if filters.get("budget_against") == "Cost Center" and dimension_name:
cc_lft, cc_rgt = frappe.db.get_value("Cost Center", dimension_name, ["lft", "rgt"]) cc_lft, cc_rgt = frappe.db.get_value("Cost Center", dimension_name, ["lft", "rgt"])
@@ -128,6 +131,7 @@ def get_actual_transactions(dimension_name, filters):
and lft >= "{cc_lft}" and lft >= "{cc_lft}"
and rgt <= "{cc_rgt}" and rgt <= "{cc_rgt}"
""" """
budget_gl_dimension_join = ""
actual_transactions = frappe.db.sql( actual_transactions = frappe.db.sql(
f""" f"""
@@ -144,7 +148,7 @@ def get_actual_transactions(dimension_name, filters):
where where
b.docstatus = 1 b.docstatus = 1
and b.account=gl.account and b.account=gl.account
and b.{budget_against} = gl.{budget_against} {budget_gl_dimension_join}
and gl.fiscal_year between %s and %s and gl.fiscal_year between %s and %s
and gl.is_cancelled = 0 and gl.is_cancelled = 0
and b.{budget_against} = %s and b.{budget_against} = %s
@@ -382,6 +386,22 @@ def get_fiscal_years(filters):
return fiscal_year return fiscal_year
def get_cost_center_with_children(cost_centers):
"""Expand each cost center to include itself and all its descendants."""
all_cost_centers = set()
for cost_center in cost_centers:
result = frappe.db.get_value("Cost Center", cost_center, ["lft", "rgt"])
if not result:
continue
lft, rgt = result
children = frappe.db.sql_list(
"SELECT name FROM `tabCost Center` WHERE lft >= %s AND rgt <= %s",
(lft, rgt),
)
all_cost_centers.update(children)
return list(all_cost_centers)
def get_budget_dimensions(filters): def get_budget_dimensions(filters):
order_by = "" order_by = ""
if filters.get("budget_against") == "Cost Center": if filters.get("budget_against") == "Cost Center":