Substitute Item Receipt and AP Invoicing

Hi,

We created a PO with 'Item A'. We did the receipt of 'Item B' (substitute item of Item A). Now when we are trying to create AP Invoice, it always pulls the item in PO which is 'Item A'. We have Invoice match option to Receipt and expectation is we want to Invoice for 'Item B' which is received.

Thanks.