Merge pull request #2378 from nabinhait/fix1

Requested and ordered qty calculation