Merge pull request #1856 from nabinhait/v4-hotfix

V4 hotfix
Merge pull request #1858 from nabinhait/v4-hotfix

with_doc issue fixes
item  query fixed in stock entry