Taking leave accrues more leave as it comes up as a work type
Bit of a confusing headline, sorry - not sure how else to describe it!
I have set up a leave category called "Bank holiday uplift" as we pay our staff a percentage (0.0352%) of their hours worked to cover bank holiday pay (so that we pay a fixed % per month rather than calculating the bank holidays each time manually). The leave type is set up to automatically accrue leave, and the Payment Setup is set as Basic.

However - on a pay run, when I select to Take Leave for that leave type (the amount accrued that month is paid in full), I end up with the leave entry on their pay run being listed as their primary work type, and their leave balance increasing.
My other issue - and why I've set the Payment Setup for the Leave Type as Basic, is that some people earn more than one hourly rate, and their bank holiday pay needs to be split so that some is paid at each rate depending on the hours they've worked. I had set up a Pay Category for Bank Holiday uplift, but was then unable to change the hourly rate in the pay run.

For example: Sam works 15 hours at rate 1, and 30 hours at rate 2. He therefore accrues 0.0352% of 15 hours (0.528 hours) and 0.0352% of 30 hours (1.056 hours). 0.528 is paid at rate 1, 1.056 is paid at rate 2.
I cannot set up the accrual to work this out for each rate, so I have it set up to accrue the total of 0.0352% of all hours worked, and then select Take Leave and put in the two separate lines so that I can set the pay rate. However, these come through as worked hours, and change the accrued leave - resulting in an excess leave balance. Over the year this is going to work out badly, with Sam's leave balance being off every month and risks us overpaying him for the leave type.
Can anyone please help me figure this out? I would prefer to set the Leave Category to use the Pay Category which matches, but for those on multiple rates this does not allow me to change the rate they are being paid at. Is there a way around this, which does not accrue excess leave and does allow me to process the leave being taken at different rates of pay?
