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

This commit is contained in:
Rushabh Mehta
2013-01-09 16:41:01 +05:30
20 changed files with 294 additions and 270 deletions

View File

@@ -174,7 +174,7 @@ var calculate_total = function(doc) {
cur_frm.fields_dict['item'].get_query = function(doc) {
return return erpnext.queries.item({
return erpnext.queries.item({
'ifnull(tabItem.is_manufactured_item, "No")': 'Yes'
})
}