Merge pull request #5670 from rohitwaghchaure/v7_fixes

[Fixes] POS amount calculation issue