Bug 5339: Invoices management improvement