diff --git a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
index c9ae0b0..b34d037 100644
--- a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
+++ b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
@@ -32,12 +32,12 @@
 
 	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")
-	report_summary = get_report_summary(period_list, filters.periodicity, income, expense, net_profit_loss, 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, currency)
 
 	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
 
 	for period in period_list:
@@ -64,19 +64,19 @@
 			"indicator": "Green" if net_profit > 0 else "Red",
 			"label": profit_label,
 			"datatype": "Currency",
-			"currency": default_currency
+			"currency": currency
 		},
 		{
 			"value": net_income,
 			"label": income_label,
 			"datatype": "Currency",
-			"currency": default_currency
+			"currency": currency
 		},
 		{
 			"value": net_expense,
 			"label": expense_label,
 			"datatype": "Currency",
-			"currency": default_currency
+			"currency": currency
 		}
 	]
 
@@ -143,4 +143,4 @@
 
 	chart["fieldtype"] = "Currency"
 
-	return chart
\ No newline at end of file
+	return chart
