[Fixes] Supplier can view their addresses, default buying price list issue
diff --git a/erpnext/templates/pages/rfq.html b/erpnext/templates/pages/rfq.html
index dfbbbc9..e4dc4e6 100644
--- a/erpnext/templates/pages/rfq.html
+++ b/erpnext/templates/pages/rfq.html
@@ -64,7 +64,7 @@
<div class="row grand-total-row">
<div class="col-xs-10 text-right">{{ _("Grand Total") }}</div>
<div class="col-xs-2 text-right">
- {{doc.currency_symbol}} <span class="tax-grand-total">0.0</span>
+ {{doc.currency_symbol}} <span class="tax-grand-total">0.0</span>
</div>
</div>
{% endif %}
diff --git a/erpnext/templates/pages/rfq.py b/erpnext/templates/pages/rfq.py
index 181cf73..4c488d9 100644
--- a/erpnext/templates/pages/rfq.py
+++ b/erpnext/templates/pages/rfq.py
@@ -4,16 +4,16 @@
from __future__ import unicode_literals
import frappe
from frappe import _
-from erpnext.controllers.website_list_for_contact import get_customers_suppliers, \
- get_party_details
+from erpnext.controllers.website_list_for_contact import (get_customers_suppliers,
+ get_party_details)
def get_context(context):
context.no_cache = 1
context.doc = frappe.get_doc(frappe.form_dict.doctype, frappe.form_dict.name)
context.parents = frappe.form_dict.parents
context.doc.supplier = get_supplier()
- update_supplier_details(context)
unauthorized_user(context.doc.supplier)
+ update_supplier_details(context)
context["title"] = frappe.form_dict.name
def get_supplier():
@@ -31,13 +31,13 @@
return status
def unauthorized_user(supplier):
- status = check_supplier_has_docname_access(supplier)
+ status = check_supplier_has_docname_access(supplier) or False
if status == False:
frappe.throw(_("Not Permitted"), frappe.PermissionError)
def update_supplier_details(context):
supplier_doc = frappe.get_doc("Supplier", context.doc.supplier)
- context.doc.currency = supplier_doc.default_currency
+ context.doc.currency = supplier_doc.default_currency or frappe.db.get_value("Company", context.doc.company, "default_currency")
context.doc.currency_symbol = frappe.db.get_value("Currency", context.doc.currency, "symbol")
context.doc.number_format = frappe.db.get_value("Currency", context.doc.currency, "number_format")
- context.doc.buying_price_list = supplier_doc.default_price_list
\ No newline at end of file
+ context.doc.buying_price_list = supplier_doc.default_price_list or ''
\ No newline at end of file