Revenue based on Despatch/Delivery not on Invoice Date

Hi -

We issue an invoice in July, with Delivery early August and Payment in August too.

We want to Recognise Revenue based on Delivery but the Payment Terms is based on date of Invoice.

However, in the P&L view, it is recognising Revenue based on Invoice Date (and Cost of Goods based on the Delivery note).

Any ideas?