added partnerid, added invoice fields