Merge branch 'master' of github.com:webnotes/erpnext into responsive

Conflicts:
	accounts/search_criteria/trend_analyzer/trend_analyzer.py
	buying/doctype/purchase_common/purchase_common.js
This commit is contained in:
Anand Doshi
2013-06-21 12:22:52 +05:30
57 changed files with 1572 additions and 95 deletions

View File

@@ -115,6 +115,15 @@ wn.module_page["Buying"] = [
"label":wn._("Requested Items To Be Ordered"),
route: "query-report/Requested Items To Be Ordered",
},
{
"label":wn._("Purchase Order Trends"),
route: "query-report/Purchase Order Trends",
doctype: "Purchase Order"
},
{
"label":wn._("Item-wise Last Purchase Rate"),
route: "query-report/Item-wise Last Purchase Rate",
}
]
}
]