Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes Requested

Browse Source
This commit is contained in:
Anurag Mishra 2019-02-18 11:43:32 +05:30
parent 4f0fd38209
commit 61f981ae05
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,19 +66,14 @@ def execute(filters=None):
def get_revenue(data, period_list, revenue_type): def get_revenue(data, period_list, revenue_type):
if revenue_type == 'gross': if revenue_type == 'gross':
gross = [item for item in data if item['include_in_gross']==1 or item['is_group']==1] revenue = [item for item in data if item['include_in_gross']==1 or item['is_group']==1]
gross, status = remove_parent_with_no_child(gross, period_list)
while status == "data to be removed":
gross, status = remove_parent_with_no_child(gross, period_list)
gross = adjust_account(gross, period_list)
return copy.deepcopy(gross)
elif revenue_type == 'non_gross': elif revenue_type == 'non_gross':
non_gross = [item for item in data if item['include_in_gross']==0 or item['is_group']==1] revenue = [item for item in data if item['include_in_gross']==0 or item['is_group']==1]
non_gross, status = remove_parent_with_no_child(non_gross, period_list) revenue, status = remove_parent_with_no_child(revenue, period_list)
while status == "data to be removed": while status == "data to be removed":
non_gross, status = remove_parent_with_no_child(non_gross, period_list) revenue, status = remove_parent_with_no_child(revenue, period_list)
non_gross = adjust_account(non_gross, period_list) revenue = adjust_account(revenue, period_list)
return copy.deepcopy(non_gross) return copy.deepcopy(revenue)
def remove_parent_with_no_child(data, period_list): def remove_parent_with_no_child(data, period_list):
status = "nothing to remove" status = "nothing to remove"