[FIX] Merge both contract views

Merged Gabriel Davini requested to merge 8.0-FIX_contract_view into 8.0-contract-payslip

Merge request reports