[fix] [minor] rename and merge for customer and supplier
Merge branch 'master' of github.com:webnotes/erpnext