Remark from MAT: invoice date wasn't passed on in original code after the original optional write.