chore: Fixed config for education
diff --git a/erpnext/buying/doctype/supplier/supplier_dashboard.py b/erpnext/buying/doctype/supplier/supplier_dashboard.py
index aea1e2d..887a093 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'),
@@ -16,8 +21,12 @@
'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 f2f430a..3142ea2 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'),
@@ -16,6 +21,10 @@
'items': ['Sales Order', 'Delivery Note', 'Sales Invoice']
},
{
+ 'label': _('Payments'),
+ 'items': ['Payment Entry']
+ },
+ {
'label': _('Support'),
'items': ['Issue']
},
@@ -32,4 +41,4 @@
'items': ['Subscription']
}
]
- }
\ No newline at end of file
+ }
diff --git a/erpnext/setup/utils.py b/erpnext/setup/utils.py
index 01e0b7d..d1c206d 100644
--- a/erpnext/setup/utils.py
+++ b/erpnext/setup/utils.py
@@ -93,7 +93,7 @@
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 welcome_email():
site_name = get_default_company()
title = _("Welcome to {0}".format(site_name))
- return title
\ No newline at end of file
+ return title