Merge branch 'develop' into FIX-ISS-22-23-05936
diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
index 7927beb..4590f8c 100644
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
@@ -113,7 +113,10 @@
def get_link(self):
# RFQ link for supplier portal
- return get_url("/app/request-for-quotation/" + self.name)
+ route = frappe.db.get_value(
+ "Portal Menu Item", {"reference_doctype": "Request for Quotation"}, ["route"]
+ )
+ return get_url("/app/{0}/".format(route) + self.name)
def update_supplier_part_no(self, supplier):
self.vendor = supplier
diff --git a/erpnext/patches/v14_0/update_opportunity_currency_fields.py b/erpnext/patches/v14_0/update_opportunity_currency_fields.py
index b803e9f..af73691 100644
--- a/erpnext/patches/v14_0/update_opportunity_currency_fields.py
+++ b/erpnext/patches/v14_0/update_opportunity_currency_fields.py
@@ -7,6 +7,9 @@
def execute():
+ frappe.reload_doc(
+ "accounts", "doctype", "currency_exchange_settings"
+ ) # get_exchange_rate depends on Currency Exchange Settings
frappe.reload_doctype("Opportunity")
opportunities = frappe.db.get_list(
"Opportunity",