Retirement tax questions

Sorry for the delay in picking this thread up -

The initial deposit was from a post-tax mutual fund.  The trustee - trustee transfer was done in Aug 2020, without a tax form, as you say, but it was NOT between two Qualified plans.  That was the mistake.  It went from a taxable account into an IRA, which would have been an excess contribution.  The mistake was found in early 2021, and the financial advisor transferred the money (plus earnings) out of the IRA in Apr 2021 to a taxable account, as it should have been done in the first place.

The IRA custodian issued the 1099-R showing it as a taxable distribution, but it should have been a removal of excess contribution; as described in the TT help file:  "request to withdraw the excess contribution, plus earnings, by the due date of the return." 

Do we need to get the IRA custodian to issue a new 1099-R?  If I just try to change the 1099-R entry 2a Taxable Amount to $0.00, Turbotax gives me errors.  Thanks for your help with this...