[MOD] Refactor code

Merged Gabriel Davini requested to merge 8.0-voucher_reference into 8.0-stage

Merge request reports