Fix: Pb with predefined invoices
Make predefined invoice feature easier to use.