[fix] Rename and merge rewrite
Merge branch '1310' of github.com:webnotes/erpnext into 1310
Merge branch '1310' of github.com:webnotes/erpnext into 1310