KRACOEUS-7308: JPA work for budget

I think if we have decided to do that consistently, now might be the time to do it unless it is much more effort and is going to delay budget further.