UICustomerInvoice Basic refactoring