Fixes to partpayment for reporting