[FIX][Task 7938] Get Pension Allowance out of Allowance category
[FIX][Task 7938] forgot to revert noupdate
[FIX][Task 7938] be consistent and only use categories in calculation of gross salary
[MERGE][TASK 7938] Phase 1 - HR -- Payroll