Merge pull request #7521 from rohitwaghchaure/discount_issue

[Fix] Sales return discount issue