[fix] [minor] changed validation message
[fix] [minor] fixes in item merging
Merge branch 'master' of github.com:webnotes/erpnext
Merge branch 'master' of git://github.com/webnotes/erpnext
[demo] [minor] Added accounts, moved JV creation to server-side
[fix] [minor] removed reserved warehouse from no_copy in sales order item
Merge branch 'master' of github.com:webnotes/erpnext
Merge branch 'master' of git://github.com/webnotes/erpnext
rohit