How do you void/return PO Receipt and update Inventory with no PO being used?

We are currently using PO Receiving, without Purchase Orders.  We do the Shipment/Invoice option, which is updating inventory and sites.  But if we need to void a Receipt, because there was no PO it doesn't update Inventory.  I can't seem to get the Return (any of the types Return, Return/Credit, Inventory and Inventory/Credit) to work either.  So we void the Receipt and do a variance/adjustment to inventory.

Does anyone know of better way to handle this? I have tried several different ways and none of them work without doing the 2 steps.