diff --git a/erpnext/buying/doctype/supplier/supplier_dashboard.py b/erpnext/buying/doctype/supplier/supplier_dashboard.py
index aea1e2d38c0..887a0937369 100644
--- a/erpnext/buying/doctype/supplier/supplier_dashboard.py
+++ b/erpnext/buying/doctype/supplier/supplier_dashboard.py
@@ -1,11 +1,16 @@
 from __future__ import unicode_literals
+
 from frappe import _
 
+
 def get_data():
 	return {
 		'heatmap': True,
 		'heatmap_message': _('This is based on transactions against this Supplier. See timeline below for details'),
 		'fieldname': 'supplier',
+		'non_standard_fieldnames': {
+			'Payment Entry': 'party_name'
+		},
 		'transactions': [
 			{
 				'label': _('Procurement'),
@@ -15,9 +20,13 @@ def get_data():
 				'label': _('Orders'),
 				'items': ['Purchase Order', 'Purchase Receipt', 'Purchase Invoice']
 			},
+			{
+				'label': _('Payments'),
+				'items': ['Payment Entry']
+			},
 			{
 				'label': _('Pricing'),
 				'items': ['Pricing Rule']
 			}
 		]
-	}
\ No newline at end of file
+	}
diff --git a/erpnext/selling/doctype/customer/customer_dashboard.py b/erpnext/selling/doctype/customer/customer_dashboard.py
index f2f430a61e2..3142ea22a4e 100644
--- a/erpnext/selling/doctype/customer/customer_dashboard.py
+++ b/erpnext/selling/doctype/customer/customer_dashboard.py
@@ -1,11 +1,16 @@
 from __future__ import unicode_literals
+
 from frappe import _
 
+
 def get_data():
 	return {
 		'heatmap': True,
 		'heatmap_message': _('This is based on transactions against this Customer. See timeline below for details'),
 		'fieldname': 'customer',
+		'non_standard_fieldnames': {
+			'Payment Entry': 'party_name'
+		},
 		'transactions': [
 			{
 				'label': _('Pre Sales'),
@@ -15,6 +20,10 @@ def get_data():
 				'label': _('Orders'),
 				'items': ['Sales Order', 'Delivery Note', 'Sales Invoice']
 			},
+			{
+				'label': _('Payments'),
+				'items': ['Payment Entry']
+			},
 			{
 				'label': _('Support'),
 				'items': ['Issue']
@@ -32,4 +41,4 @@ def get_data():
 				'items': ['Subscription']
 			}
 		]
-	}
\ No newline at end of file
+	}
diff --git a/erpnext/setup/utils.py b/erpnext/setup/utils.py
index 01e0b7d441a..d1c206d8b1d 100644
--- a/erpnext/setup/utils.py
+++ b/erpnext/setup/utils.py
@@ -93,7 +93,7 @@ def get_exchange_rate(from_currency, to_currency, transaction_date=None, args=No
 
 	try:
 		cache = frappe.cache()
-		key = "currency_exchange_rate:{0}:{1}".format(from_currency, to_currency)
+		key = "currency_exchange_rate_{0}:{1}:{2}".format(transaction_date,from_currency, to_currency)
 		value = cache.get(key)
 
 		if not value:
@@ -143,4 +143,4 @@ def insert_record(records):
 def welcome_email():
 	site_name = get_default_company()
 	title = _("Welcome to {0}".format(site_name))
-	return title
\ No newline at end of file
+	return title