Reports - Finance Invoice - Trainer Field

Within our RTO we report our revenue at a trainer level. Currently I am having to run multiple reports to be able to achieve this, 1 report against Workshop Invoice, 1 report against Enrolment invoices, another against Line Item invoice and then expected revenue against resulted funded units. This is extremely time consuming and creates a very complex spreadsheet to formulate all the data.

Ideally against the Invoices report it would be great if you can pull in the trainer field against the enrolment or workshop the invoice was being created against, and where invoices weren't created against enrolment / workshop the field is left blank. This would allow only 1 report to be ran against invoicing.

Does any other RTO report revenue in a similar way? or have some tips on other ways you report revenue?