Issue #24224:nomalize sales reporting
Merge pull request #1732 from garyhgohoos/24224-2

Issue #24224:nomalize sales reporting
I'll pick up the `select *` while working on issue #24329