changed args to filters in get_query
get_query continued
fixed conflict
Merge branch 'master' of github.com:webnotes/erpnext