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

minor fixes

Browse Source
This commit is contained in:
Anurag Mishra 2019-03-04 12:27:41 +05:30
parent a9a1552e32
commit f3bdeedc68
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,10 +79,10 @@ def get_revenue(data, period_list, revenue_type):
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"
for parent in data: for parent in data:
if 'is_group' in parent and parent["is_group"] == 1: if 'is_group' in parent and parent.get("is_group") == 1:
have_child = False have_child = False
for child in data: for child in data:
if 'parent_account' in child and child["parent_account"] == parent["account"]: if 'parent_account' in child and child.get("parent_account") == parent.get("account"):
have_child = True have_child = True
break break
@ -116,8 +116,6 @@ def set_total(node, value, complete_list, totals):
def get_profit(gross_income, gross_expense, period_list, company, profit_type, currency=None, consolidated=False): def get_profit(gross_income, gross_expense, period_list, company, profit_type, currency=None, consolidated=False):
total = 0
profit_loss = { profit_loss = {
"account_name": "'" + _(profit_type) + "'", "account_name": "'" + _(profit_type) + "'",
"account": "'" + _(profit_type) + "'", "account": "'" + _(profit_type) + "'",
@ -134,14 +132,10 @@ def get_profit(gross_income, gross_expense, period_list, company, profit_type, c
if profit_loss[key]: if profit_loss[key]:
has_value=True has_value=True
total += flt(profit_loss[key])
profit_loss['total'] = total
if has_value: if has_value:
return profit_loss return profit_loss
def get_net_profit(non_gross_income, gross_income, gross_expense, non_gross_expense, period_list, company, currency=None, consolidated=False): def get_net_profit(non_gross_income, gross_income, gross_expense, non_gross_expense, period_list, company, currency=None, consolidated=False):
total = 0
profit_loss = { profit_loss = {
"account_name": "'" + _("Net Profit") + "'", "account_name": "'" + _("Net Profit") + "'",
"account": "'" + _("Net Profit") + "'", "account": "'" + _("Net Profit") + "'",
@ -160,8 +154,5 @@ def get_net_profit(non_gross_income, gross_income, gross_expense, non_gross_expe
if profit_loss[key]: if profit_loss[key]:
has_value=True has_value=True
total += flt(profit_loss[key])
profit_loss['total'] = total
if has_value: if has_value:
return profit_loss return profit_loss