[usability] item price moved to price list
[fix] [minor] merge conflict fixed
[fix] test cases fix for price list
[fix] journal voucher to fetch company currency
[fix] [minor] merge conflict fixed
[fix] make demo for price list
[fix] [pos] hide custom buttons in pos view
Merge branch 'master' of github.com:webnotes/erpnext
[fix] removed client side validation for conversion rate
[fix] [minor] price list patch of june 2013 update fixed
[fix] [minor] price list patch fixed
Merge branch 'akhileshdarjee-master' into website-wip
[fix] [minor] get_url and fixes due to addition of create permission check
[fix] [minor] price list patch