Cannot help re the 'correctness' of it, (have you got it in writing from the CAA?), but, if they have approved it, then you would only need to calculate the total amount and put it in as a single entry with the CAA letter as your authority.
Suggest you get it in writing though.