Merge pull request #6690 from rohitwaghchaure/v7_pricing_rule_issue

[Fix] Pricing rule discount issue