[mapper] fixes
Merge branch 'master' of https://github.com/webnotes/erpnext