Re: Invoiced but not delivered.

You could consider using down payment invoices for the original invoice and then raise the final invoice at the time of delivery. This does have a little more work entailed, but does provide the benefit of ensuring revenue recognition is more correct.