Merge pull request #6611 from nabinhait/hotfix

Always calculate additional discount amount if percentage is mentioned