issue #20734: Add support on shipment returns for other order types.