nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 08:54:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Show Cumulative Amount based on checkbox in filter

Browse Source
This commit is contained in:
khushi8112
2026-01-05 18:43:20 +05:30
parent f56a673baa
commit f6a4f696a1
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -183,6 +183,8 @@ def get_months_in_range(start_date, end_date):
def get_data_from_budget_map(budget_map, filters): def get_data_from_budget_map(budget_map, filters):
data = [] data = []
show_cumulative = filters.get("show_cumulative") and filters.get("period") != "Yearly"
fiscal_years = get_fiscal_years(filters) fiscal_years = get_fiscal_years(filters)
group_months = filters["period"] != "Monthly" group_months = filters["period"] != "Monthly"
@@ -193,12 +195,15 @@ def get_data_from_budget_map(budget_map, filters):
"account": account, "account": account,
} }
total_budget = 0
total_actual = 0
for fy in fiscal_years: for fy in fiscal_years:
fy_name = fy[0] fy_name = fy[0]
running_budget = 0
running_actual = 0
total_budget = 0
total_actual = 0
for from_date, to_date in get_period_date_ranges(filters["period"], fy_name): for from_date, to_date in get_period_date_ranges(filters["period"], fy_name):
months = get_months_between(from_date, to_date) months = get_months_between(from_date, to_date)
@@ -224,13 +229,19 @@ def get_data_from_budget_map(budget_map, filters):
actual_label = _("Actual") + f" ({label_suffix}) {fy_name}" actual_label = _("Actual") + f" ({label_suffix}) {fy_name}"
variance_label = _("Variance") + f" ({label_suffix}) {fy_name}" variance_label = _("Variance") + f" ({label_suffix}) {fy_name}"
total_budget += period_budget
total_actual += period_actual
if show_cumulative:
running_budget += period_budget
running_actual += period_actual
period_budget = running_budget
period_actual = running_actual
row[frappe.scrub(budget_label)] = period_budget row[frappe.scrub(budget_label)] = period_budget
row[frappe.scrub(actual_label)] = period_actual row[frappe.scrub(actual_label)] = period_actual
row[frappe.scrub(variance_label)] = period_budget - period_actual row[frappe.scrub(variance_label)] = period_budget - period_actual
total_budget += period_budget
total_actual += period_actual
if filters["period"] != "Yearly": if filters["period"] != "Yearly":
row["total_budget"] = total_budget row["total_budget"] = total_budget
row["total_actual"] = total_actual row["total_actual"] = total_actual