Correct report handling for full and partial refunds.

Fixes #6530

@claudiosmweb look good?