RTV with discount is generating wrong accounting entries

When we do purchase return for the which the discount is applicable, the item amount will be reduced from inventory value and discount amount will be added by average cost.

Post GST, the average cost update for RTV transactions, the discount amount is reduced and adding the receiving material account. It should be reverse side of accounting.

Anyone face this issue?

Shanthi