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

Fixes in Stock Entry and test cases