started party frappe/erpnext#1503
Merge branch 'model-cleanup' of github.com:frappe/erpnext into model-cleanup