[cleanup] request for quotation cleanup
diff --git a/erpnext/templates/emails/request_for_quotation.html b/erpnext/templates/emails/request_for_quotation.html
index 91bdd6b..aedd8e2 100644
--- a/erpnext/templates/emails/request_for_quotation.html
+++ b/erpnext/templates/emails/request_for_quotation.html
@@ -1,12 +1,11 @@
<h3>{{_("Request for Quotation")}}</h3>
-<br>
<p>{{ message }}</p>
{% if update_password_link %}
<p>{{_("Please click on the following link to set your new password")}}:</p>
<p><a href="{{ update_password_link }}">{{ update_password_link }}</a></p>
{% else %}
<p>{{_("Request for quotation can be access by clicking following link")}}:</p>
-<p><a href="{{ rfq_link }}">{{ rfq_link }}</a></p>
+<p><a href="{{ rfq_link }}">Submit your Quotation</a></p>
{% endif %}
<p>{{_("Thank you")}},<br>
{{ user_fullname }}</p>
\ No newline at end of file
diff --git a/erpnext/templates/includes/rfq/rfq_items.html b/erpnext/templates/includes/rfq/rfq_items.html
index de9a95f..f03fb8f 100644
--- a/erpnext/templates/includes/rfq/rfq_items.html
+++ b/erpnext/templates/includes/rfq/rfq_items.html
@@ -22,7 +22,7 @@
style="margin-top: 5px; max-width: 70px;display: inline-block" value="0.00"
data-idx="{{ d.idx }}">
</div>
- <div class="col-sm-2 col-xs-2 text-right">
+ <div class="col-sm-2 col-xs-2 text-right" style="padding-top: 9px;">
<span class="rfq-amount" data-idx="{{ d.idx }}">0.00</span>
</div>
</div>
diff --git a/erpnext/templates/pages/rfq.html b/erpnext/templates/pages/rfq.html
index 5556d26..8009819 100644
--- a/erpnext/templates/pages/rfq.html
+++ b/erpnext/templates/pages/rfq.html
@@ -69,11 +69,10 @@
</div>
{% endif %}
<div class="row terms">
- <div class="col-xs-5 text-left text-muted">{{ _("Terms and Conditions: ") }}</div>
- </div>
- <div class="row terms">
- <div class="col-xs-5 text-left text-muted">
- <textarea class="form-control terms-feedback" style="border:1px solid #cccccc; padding:4px"></textarea>
+ <div class="col-xs-6">
+ <br><br>
+ <p class="text-muted small">{{ _("Notes: ") }}</p>
+ <textarea class="form-control terms-feedback" style="height: 100px;"></textarea>
</div>
</div>
</div>
diff --git a/erpnext/templates/pages/rfq.py b/erpnext/templates/pages/rfq.py
index fbdd6db..aefa315 100644
--- a/erpnext/templates/pages/rfq.py
+++ b/erpnext/templates/pages/rfq.py
@@ -25,7 +25,7 @@
def check_supplier_has_docname_access(supplier):
status = True
- if frappe.form_dict.name not in frappe.db.sql_list("""select parent from `tabRFQ Supplier`
+ if frappe.form_dict.name not in frappe.db.sql_list("""select parent from `tabRequest for Quotation Supplier`
where supplier = '{supplier}'""".format(supplier=supplier)):
status = False
return status