invoice fix

Merged Luciano Ortiz requested to merge 8.0-fixes into 8.0-stage

Merge request reports