Fixing invoice creation for single and multiple invoices