Invoices only collate uninvoiced items (this had regressed)