issue #22393: progress on fluent invoice report

This is Linda's pull with a merge conflict resolved