dev/financial#187 - backport 21729

[demeritcowboy]

Overview

#21729 was intended to be against 5.42 but got put against master. I think maybe master needs to be reverted, then this merged forward.

[civibot]

(Standard links)

• If this is your first pull-request for CiviCRM, please browse CONTRIBUTING.md for information about the development and testing processes.
• If you are reviewing this pull-request, you may wish to consult the test sites and the Review Standards (long template, short template).

[eileenmcnaughton]

I don't think we need to revert master - we can manage that in the merge commit