InvoicesGenerator, part 2
invoice generation part2 after merge