diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 37fd8692e5..3a8569b677 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -62,49 +62,49 @@ website_route_rules = [ {"from_route": "/orders/", "to_route": "order", "defaults": { "doctype": "Sales Order", - "parents": [{"title": _("Orders"), "name": "orders"}] + "parents": [{"label": _("Orders"), "route": "orders"}] } }, {"from_route": "/invoices", "to_route": "Sales Invoice"}, {"from_route": "/invoices/", "to_route": "order", "defaults": { "doctype": "Sales Invoice", - "parents": [{"title": _("Invoices"), "name": "invoices"}] + "parents": [{"label": _("Invoices"), "route": "invoices"}] } }, {"from_route": "/supplier-quotations", "to_route": "Supplier Quotation"}, {"from_route": "/supplier-quotations/", "to_route": "order", "defaults": { "doctype": "Supplier Quotation", - "parents": [{"title": _("Supplier Quotation"), "name": "quotations"}] + "parents": [{"label": _("Supplier Quotation"), "route": "quotations"}] } }, {"from_route": "/quotations", "to_route": "Quotation"}, {"from_route": "/quotations/", "to_route": "order", "defaults": { "doctype": "Quotation", - "parents": [{"title": _("Quotations"), "name": "quotation"}] + "parents": [{"label": _("Quotations"), "route": "quotation"}] } }, {"from_route": "/shipments", "to_route": "Delivery Note"}, {"from_route": "/shipments/", "to_route": "order", "defaults": { "doctype": "Delivery Note", - "parents": [{"title": _("Shipments"), "name": "shipments"}] + "parents": [{"label": _("Shipments"), "route": "shipments"}] } }, {"from_route": "/rfq", "to_route": "Request for Quotation"}, {"from_route": "/rfq/", "to_route": "rfq", "defaults": { "doctype": "Request for Quotation", - "parents": [{"title": _("Request for Quotation"), "name": "rfq"}] + "parents": [{"label": _("Request for Quotation"), "route": "rfq"}] } }, {"from_route": "/addresses", "to_route": "Address"}, {"from_route": "/addresses/", "to_route": "addresses", "defaults": { "doctype": "Address", - "parents": [{"title": _("Addresses"), "name": "addresses"}] + "parents": [{"label": _("Addresses"), "route": "addresses"}] } }, {"from_route": "/jobs", "to_route": "Job Opening"}, diff --git a/erpnext/support/web_form/issues/issues.json b/erpnext/support/web_form/issues/issues.json index 6474799277..264b9dfbc2 100644 --- a/erpnext/support/web_form/issues/issues.json +++ b/erpnext/support/web_form/issues/issues.json @@ -7,16 +7,18 @@ "allow_multiple": 1, "allow_print": 0, "amount": 0.0, - "breadcrumbs": "[{\"title\":\"Issues\", \"name\":\"issues\"}]", + "amount_based_on_field": 0, + "breadcrumbs": "[{\"label\":_(\"Issues\"), \"route\":\"issues\"}]", "creation": "2016-06-24 15:50:33.186483", "doc_type": "Issue", "docstatus": 0, "doctype": "Web Form", "idx": 0, + "introduction_text": "", "is_standard": 1, "login_required": 1, "max_attachment_size": 0, - "modified": "2016-12-07 04:26:13.917693", + "modified": "2017-07-25 22:49:10.762704", "modified_by": "Administrator", "module": "Support", "name": "issues", diff --git a/erpnext/templates/pages/order.html b/erpnext/templates/pages/order.html index da9eb33c89..3e4eca3a98 100644 --- a/erpnext/templates/pages/order.html +++ b/erpnext/templates/pages/order.html @@ -80,7 +80,7 @@

Pay {{ doc.get_formatted("grand_total") }} + class="btn btn-primary btn-sm">{{ _("Pay") }} {{ doc.get_formatted("grand_total") }}

{% endif %} diff --git a/erpnext/templates/pages/order.py b/erpnext/templates/pages/order.py index b453c7e3e7..7551a0f9bb 100644 --- a/erpnext/templates/pages/order.py +++ b/erpnext/templates/pages/order.py @@ -18,6 +18,7 @@ def get_context(context): context.attachments = get_attachments(frappe.form_dict.doctype, frappe.form_dict.name) context.parents = frappe.form_dict.parents + context.title = frappe.form_dict.name context.payment_ref = frappe.db.get_value("Payment Request", {"reference_name": frappe.form_dict.name}, "name")