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

@@ -252,6 +252,21 @@ wn.module_page["Accounts"] = [
route: "query-report/Item-wise Purchase Register",
doctype: "Purchase Invoice"
},
{
"label":wn._("Budget Variance Report"),
route: "query-report/Budget Variance Report",
doctype: "Cost Center"
},
{
"label":wn._("Purchase Invoice Trends"),
route: "query-report/Purchase Invoice Trends",
doctype: "Purchase Invoice"
},
{
"label":wn._("Sales Invoice Trends"),
route: "query-report/Sales Invoice Trends",
doctype: "Sales Invoice"
},
]
}
]