added validation for save conflict in single types too
Merge branch 'master' of github.com:webnotes/erpnext
use get_global_default instead of control panel
brought back master.sql.gz
Merge branch 'master' of github.com:webnotes/erpnext
fixes in price list for purchase
Merge branch 'master' into edge