EHF invoice 2.0.3 - part 2