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

Conflicts:
	patches/patch_list.py
This commit is contained in:
Anand Doshi
2013-07-08 11:53:35 +05:30
6 changed files with 9 additions and 30 deletions

View File

@@ -161,8 +161,8 @@ wn.module_page["Selling"] = [
route: "query-report/Customer Addresses And Contacts"
},
{
"label":wn._("Sales Orders Pending to be Delivered"),
route: "query-report/Sales Orders Pending To Be Delivered"
"label":wn._("Ordered Items To Be Delivered"),
route: "query-report/Ordered Items To Be Delivered",
},
{
"label":wn._("Sales Person-wise Transaction Summary"),