Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into FIX-ISS-22-23-05936

Browse Source
This commit is contained in:
Sagar Sharma 2023-03-20 10:28:10 +05:30 committed by GitHub
commit 4c35a37eaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
View File

@ -113,7 +113,10 @@ class RequestforQuotation(BuyingController):
def get_link(self): def get_link(self):
# RFQ link for supplier portal # 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): def update_supplier_part_no(self, supplier):
self.vendor = supplier self.vendor = supplier

3
erpnext/patches/v14_0/update_opportunity_currency_fields.py
View File

@ -7,6 +7,9 @@ from erpnext.setup.utils import get_exchange_rate
def execute(): def execute():
frappe.reload_doc(
"accounts", "doctype", "currency_exchange_settings"
) # get_exchange_rate depends on Currency Exchange Settings
frappe.reload_doctype("Opportunity") frappe.reload_doctype("Opportunity")
opportunities = frappe.db.get_list( opportunities = frappe.db.get_list(
"Opportunity", "Opportunity",