Merge branch 'master' into develop

2017-09-27 13:05:21 +05:30
parent 946e182564 e0a845c356
commit 76e1ca35ad
12 changed files with 27 additions and 22 deletions
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -80,7 +80,7 @@ website_route_rules = [
 	{"from_route": "/supplier-quotations/<path:name>", "to_route": "order",
 		"defaults": {
 			"doctype": "Supplier Quotation",
-			"parents": [{"label": _("Supplier Quotation"), "route": "quotations"}]
+			"parents": [{"label": _("Supplier Quotation"), "route": "supplier-quotations"}]
 		}
 	},
 	{"from_route": "/quotations", "to_route": "Quotation"},