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

Conflicts:
	patches/patch_list.py
	stock/report/stock_ledger/stock_ledger.txt
This commit is contained in:
Anand Doshi
2013-01-14 13:28:31 +05:30
21 changed files with 238 additions and 168 deletions

View File

@@ -143,6 +143,11 @@ wn.module_page["Selling"] = [
"label":wn._("Sales Analytics"),
page: "sales-analytics"
},
{
"label":wn._("Trend Analyzer"),
route: "Report/Profile/Trend Analyzer",
doctype: "Sales Order"
},
]
},
{
@@ -151,8 +156,8 @@ wn.module_page["Selling"] = [
icon: "icon-list",
items: [
{
"label":wn._("Customer Addresses and Contacts"),
route: "query-report/Customer Addresses and Contacts"
"label":wn._("Customer Addresses And Contacts"),
route: "query-report/Customer Addresses And Contacts"
},
{
"label":wn._("Sales Orders Pending to be Delivered"),