Leaver Payments

At present if you make an employee a leaver in the following month, add in the additional pay and produce a P45 the software will re-add them to the next months payroll and pro rata salary. This could result in overpayments and confusion as employee has already been paid and made a leaver. Please could this setting be changed.