RT#37125: Include discounts in report: customer accounting summary [some fixes]