Split the invoice
Add a button to set a picking back to "To Be Invoiced"
Invoices created from picking grouped by product or by product category