[jsonrates api] add from global defaults
diff --git a/erpnext/setup/utils.py b/erpnext/setup/utils.py
index 2923f67..cef6079 100644
--- a/erpnext/setup/utils.py
+++ b/erpnext/setup/utils.py
@@ -60,14 +60,16 @@
@frappe.whitelist()
def get_exchange_rate(from_currency, to_currency):
- if frappe.conf.jsonrates_api_key:
+ jsonrates_api_key = frappe.conf.jsonrates_api_key or frappe.db.get_default("jsonrates_api_key")
+
+ if jsonrates_api_key:
cache = frappe.cache()
key = "currency_exchange_rate:{0}:{1}".format(from_currency, to_currency)
value = cache.get(key)
if not value:
import requests
response = requests.get("http://jsonrates.com/get/?from={0}&to={1}&apiKey={2}".format(from_currency,
- to_currency, frappe.conf.jsonrates_api_key))
+ to_currency, jsonrates_api_key))
# expire in 24 hours
value = response.json().get("rate")
cache.setex(key, value, 24 * 60 * 60)