fix: currency symbol in profit and loss report

This commit is contained in:
Rohit Waghchaure
2020-09-30 17:44:35 +05:30
parent fcb6ba6ec7
commit b428e4c493

View File

@@ -32,7 +32,7 @@ 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 = frappe.get_cached_value('Company', filters.company, "default_currency") default_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, default_currency)
return columns, data, None, chart, report_summary return columns, data, None, chart, report_summary
@@ -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": net_profit_loss.get("currency") if net_profit_loss else default_currency "currency": default_currency
}, },
{ {
"value": net_income, "value": net_income,
"label": income_label, "label": income_label,
"datatype": "Currency", "datatype": "Currency",
"currency": income[-1].get('currency') if income else default_currency "currency": default_currency
}, },
{ {
"value": net_expense, "value": net_expense,
"label": expense_label, "label": expense_label,
"datatype": "Currency", "datatype": "Currency",
"currency": expense[-1].get('currency') if expense else default_currency "currency": default_currency
} }
] ]