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

Update profit_and_loss_statement.py

Browse Source
This commit is contained in:
rohitwaghchaure 2020-09-30 18:17:21 +05:30 committed by GitHub
parent b428e4c493
commit d65e050f4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
View File

@ -32,12 +32,12 @@ def execute(filters=None):
chart = get_chart_data(filters, columns, income, expense, net_profit_loss) chart = get_chart_data(filters, columns, income, expense, net_profit_loss)
default_currency = filters.presentation_currency or frappe.get_cached_value('Company', filters.company, "default_currency") currency = filters.presentation_currency or frappe.get_cached_value('Company', filters.company, "default_currency")
report_summary = get_report_summary(period_list, filters.periodicity, income, expense, net_profit_loss, default_currency) report_summary = get_report_summary(period_list, filters.periodicity, income, expense, net_profit_loss, currency)
return columns, data, None, chart, report_summary return columns, data, None, chart, report_summary
def get_report_summary(period_list, periodicity, income, expense, net_profit_loss, default_currency, consolidated=False): def get_report_summary(period_list, periodicity, income, expense, net_profit_loss, currency, consolidated=False):
net_income, net_expense, net_profit = 0.0, 0.0, 0.0 net_income, net_expense, net_profit = 0.0, 0.0, 0.0
for period in period_list: for period in period_list:
@ -64,19 +64,19 @@ def get_report_summary(period_list, periodicity, income, expense, net_profit_los
"indicator": "Green" if net_profit > 0 else "Red", "indicator": "Green" if net_profit > 0 else "Red",
"label": profit_label, "label": profit_label,
"datatype": "Currency", "datatype": "Currency",
"currency": default_currency "currency": currency
}, },
{ {
"value": net_income, "value": net_income,
"label": income_label, "label": income_label,
"datatype": "Currency", "datatype": "Currency",
"currency": default_currency "currency": currency
}, },
{ {
"value": net_expense, "value": net_expense,
"label": expense_label, "label": expense_label,
"datatype": "Currency", "datatype": "Currency",
"currency": default_currency "currency": currency
} }
] ]
@ -143,4 +143,4 @@ def get_chart_data(filters, columns, income, expense, net_profit_loss):
chart["fieldtype"] = "Currency" chart["fieldtype"] = "Currency"
return chart return chart