Invoice now contains Expenses

Merged Eric Horvat requested to merge 8.0-FIX-add-expenses-to-invoice into 8.0-stage

Merge request reports