diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 2f0c4a38a0..4392a0a6d3 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -142,7 +142,8 @@ class AccountsController(TransactionBase):
             elif self.currency == self.company_currency:
                 self.conversion_rate = 1.0
             elif not self.conversion_rate:
-                self.conversion_rate = get_exchange_rate(self.currency,
+                # cksgb 19/09/2016: added transaction date to arguments for get_exchange_rate
+                self.conversion_rate = get_exchange_rate(self.transaction_date, self.currency,
                     self.company_currency)
 
     def set_missing_item_details(self):
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index 1e3bd8a209..414b2005cf 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -468,7 +468,8 @@ def get_price_list_currency_and_exchange_rate(args):
 
 	if (not plc_conversion_rate) or (price_list_currency and args.price_list_currency \
 		and price_list_currency != args.price_list_currency):
-			plc_conversion_rate = get_exchange_rate(price_list_currency, args.currency) or plc_conversion_rate
+        # cksgb 19/09/2016: added args.transaction_date as posting_date argument for get_exchange_rate
+			plc_conversion_rate = get_exchange_rate(args.transaction_date, price_list_currency, args.currency) or plc_conversion_rate
 
 	return frappe._dict({
 		"price_list_currency": price_list_currency,