POS print format fixed
Merge branch 'master' of github.com:webnotes/erpnext into hotfix
merge conflict fixed
Merge pull request #1296 from akhileshdarjee/hotfix

POS print format fixed