Merge pull request #1942 from anandpdoshi/anand-july-16

Fixes in Setup Wizard and Support Ticket
Fixes in Stock Entry and test cases