fix subtotal and per-group item count on payment report, #25944 and #71364