KRACOEUS-8189
Apply to later periods fix
Refactor personnel and non-personnel cost
Merge pull request #1033 from rmancher/budget-personnel-nonpersonnel-fix

KRACOEUS-8189