Merge pull request #3442 from nabinhait/develop

fixes in stock entry and report