[ADD] Add location_id field to report tree view and some code cleaning

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

Merge request reports