Heaven Can Wait.

I guess the 1978 Warren Beatty/Buck Henry film of the same title is not based on this original but on Here Comes Mr. Jordan (1941) ?