Fixes related to Website Route system and other misc fixes
diff --git a/erpnext/templates/generators/partner.html b/erpnext/templates/generators/sales_partner.html
similarity index 100%
rename from erpnext/templates/generators/partner.html
rename to erpnext/templates/generators/sales_partner.html
diff --git a/erpnext/templates/pages/partners.html b/erpnext/templates/pages/partners.html
index 089c15b..181c6b3 100644
--- a/erpnext/templates/pages/partners.html
+++ b/erpnext/templates/pages/partners.html
@@ -9,13 +9,13 @@
<div class="col-md-3">
{% if partner_info.logo -%}
<a href="{{ partner_info.page_name }}">
- <img itemprop="brand" src="{{ partner_info.logo }}" class="partner-logo"
+ <img itemprop="brand" src="{{ partner_info.logo }}" class="partner-logo"
alt="{{ partner_info.partner_name }}" title="{{ partner_info.partner_name }}" />
</a>
{%- endif %}
</div>
<div class="col-md-9">
- <a href="{{ partner_info.page_name }}">
+ <a href="{{ partner_info.route }}">
<h4>{{ partner_info.partner_name }}</h4>
</a>
<p style="color: #999">{{ partner_info.territory }} - {{ partner_info.partner_type }}</p>
@@ -27,4 +27,4 @@
</div>
{% endblock %}
-{% block sidebar %}{% include "templates/includes/sidebar.html" %}{% endblock %}
\ No newline at end of file
+{% block sidebar %}{% include "templates/includes/sidebar.html" %}{% endblock %}
diff --git a/erpnext/templates/pages/partners.py b/erpnext/templates/pages/partners.py
index 94b553c..7dc20d4 100644
--- a/erpnext/templates/pages/partners.py
+++ b/erpnext/templates/pages/partners.py
@@ -5,9 +5,16 @@
import frappe
import frappe.website.render
+page_title = "Partners"
+
def get_context(context):
+ partners = frappe.db.sql("""select * from `tabSales Partner`
+ where show_in_website=1 order by name asc""", as_dict=True)
+
+ for p in partners:
+ p.route = frappe.get_doc("Sales Partner", p.name).get_route()
+
return {
- "partners": frappe.db.sql("""select * from `tabSales Partner`
- where show_in_website=1 order by name asc""", as_dict=True),
- "title": "Partners"
+ "partners": partners,
+ "title": page_title
}