"software is giving credit for last year AND this year"

No software that is Annual, is giving Both Years.

It helps to separate the two types of provisions you are asking about, so that the specifics apply only to each condition. Also, there is a difference between getting "credits" and getting funds in advance, so make sure to include who got what and when and how much, for each type of provision. Thanks.