From a53832e16e45909cdf87d205b31c7bbd2a3400bd Mon Sep 17 00:00:00 2001 From: Anoop Kurungadam Date: Tue, 9 May 2023 09:16:10 +0530 Subject: [PATCH] refactor: merge separate loops for calculating group / leaf node totals rename function remove return statement as the list is mutated (cherry picked from commit 1a3b9c5bdfb9fac04a3a7d8724e6b3c3b593ec19) --- .../gross_and_net_profit_report.py | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py b/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py index f2412819c4e..a7b7f270cfd 100644 --- a/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py +++ b/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py @@ -126,7 +126,9 @@ def get_revenue(data, period_list, include_in_gross=1): data_to_be_removed = True while data_to_be_removed: revenue, data_to_be_removed = remove_parent_with_no_child(revenue) - revenue = adjust_account(revenue, period_list) + + adjust_account_totals(revenue, period_list) + return copy.deepcopy(revenue) @@ -147,23 +149,19 @@ def remove_parent_with_no_child(data): return data, data_to_be_removed -def adjust_account(data, period_list): - leaf_nodes = [item for item in data if item["is_group"] == 0] +def adjust_account_totals(data, period_list): totals = {} - for node in leaf_nodes: - set_total(node, node["total"], data, totals) - for d in reversed(data): - for period in period_list: - if d.get("is_group"): + if d.get("is_group"): + for period in period_list: # reset totals for group accounts as totals set by get_data doesn't consider include_in_gross check d[period.key] = sum( item[period.key] for item in data if item.get("parent_account") == d.get("account") ) + else: + set_total(d, d["total"], data, totals) - d["total"] = totals[d["account"]] - - return data + d["total"] = totals[d["account"]] def set_total(node, value, complete_list, totals): @@ -177,6 +175,7 @@ def set_total(node, value, complete_list, totals): next(item for item in complete_list if item["account"] == parent), value, complete_list, totals ) + def get_profit( gross_income, gross_expense, period_list, company, profit_type, currency=None, consolidated=False ):