nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Gross and Net Profit Report - incorrect calculation of totals

Browse Source 
* fix: account group totals calculation to consider include_in_gross

(cherry picked from commit 8dcb9302b4)

* refactor: remove unused parameters

(cherry picked from commit 50822f207e)

* refactor: merge separate loops for calculating group / leaf node totals
rename function
remove return statement as the list is  mutated

(cherry picked from commit 1a3b9c5bdf)

* fix: add total col for gross and net profit

(cherry picked from commit cb9b4fbb91)

---------

Co-authored-by: Anoop Kurungadam <anoop@earthianslive.com>
This commit is contained in:
mergify[bot]
2023-05-25 18:12:50 +05:30
committed by GitHub
parent ba59f53939
commit 55806c51f2
1 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py
View File

@@ -125,12 +125,14 @@ def get_revenue(data, period_list, include_in_gross=1):
data_to_be_removed = True data_to_be_removed = True
while data_to_be_removed: while data_to_be_removed:
revenue, data_to_be_removed = remove_parent_with_no_child(revenue, period_list) 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) return copy.deepcopy(revenue)
def remove_parent_with_no_child(data, period_list): def remove_parent_with_no_child(data):
data_to_be_removed = False data_to_be_removed = False
for parent in data: for parent in data:
if "is_group" in parent and parent.get("is_group") == 1: if "is_group" in parent and parent.get("is_group") == 1:
@@ -147,16 +149,19 @@ def remove_parent_with_no_child(data, period_list):
return data, data_to_be_removed return data, data_to_be_removed
def adjust_account(data, period_list, consolidated=False): def adjust_account_totals(data, period_list):
leaf_nodes = [item for item in data if item["is_group"] == 0]
totals = {} totals = {}
for node in leaf_nodes: for d in reversed(data):
set_total(node, node["total"], data, totals) if d.get("is_group"):
for d in data: for period in period_list:
for period in period_list: # reset totals for group accounts as totals set by get_data doesn't consider include_in_gross check
key = period if consolidated else period.key d[period.key] = sum(
d["total"] = totals[d["account"]] item[period.key] for item in data if item.get("parent_account") == d.get("account")
return data )
else:
set_total(d, d["total"], data, totals)
d["total"] = totals[d["account"]]
def set_total(node, value, complete_list, totals): def set_total(node, value, complete_list, totals):
@@ -191,6 +196,9 @@ def get_profit(
if profit_loss[key]: if profit_loss[key]:
has_value = True has_value = True
if not profit_loss.get("total"):
profit_loss["total"] = 0
profit_loss["total"] += profit_loss[key]
if has_value: if has_value:
return profit_loss return profit_loss
@@ -229,6 +237,9 @@ def get_net_profit(
if profit_loss[key]: if profit_loss[key]:
has_value = True has_value = True
if not profit_loss.get("total"):
profit_loss["total"] = 0
profit_loss["total"] += profit_loss[key]
if has_value: if has_value:
return profit_loss return profit_loss