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

@@ -159,18 +159,37 @@ wn.module_page["Selling"] = [
},
{
"label":wn._("Sales Person-wise Transaction Summary"),
route: "query-report/Sales Person-wise Transaction Summary",
route: "query-report/Sales Person-wise Transaction Summary"
},
{
"label":wn._("Item-wise Sales History"),
route: "query-report/Item-wise Sales History",
route: "query-report/Item-wise Sales History"
},
{
"label":wn._("Territory Target Variance (Item Group-Wise)"),
route: "query-report/Territory Target Variance (Item Group-Wise)",
doctype: "Sales Order"
},
{
"label":wn._("Sales Person Target Variance (Item Group-Wise)"),
route: "query-report/Sales Person Target Variance (Item Group-Wise)",
doctype: "Sales Order"
},
{
"label":wn._("Customers Not Buying Since Long Time"),
route: "query-report/Customers Not Buying Since Long Time",
doctype: "Sales Order"
},
{
"label":wn._("Quotation Trend"),
route: "query-report/Quotation Trends",
doctype: "Quotation"
},
{
"label":wn._("Sales Order Trend"),
route: "query-report/Sales Order Trends",
doctype: "Sales Order"
},
]
}
]