State residency start date and income allocation

I moved back to the States (and settled in NJ specifically) last April on 23rd from Europe, and I received my bonus and final salary payment from my foreign employer on April 21. Am I correct to allocate the salary payment to non-residency period on the part-year return given it's foreign sourced and received just before I landed in NJ?

 

Additionally, if I am filing a joint return with my partner now, who moved into the state earlier - shall we do the income allocation separately and attach a statement to explain the different residency period? It seems the sample NJ tax form only have one line for start / end date on the return. Thanks a lot.