Require refunding to the customer through Payables Invoice to the existing Supplier

Hi

I am facing an issue on Customer refund process in Receivables receipt through Payables invoice to the Supplier, here the receipt creates the refund Payable Invoices with Customer name (without Supplier Num and Supplier Site) and Business not able to relate the Customer and Supplier for Audit purposes. since the system has already the Customer (say customer name as "ABC") and the Supplier (supplier name as "ABC**") and user can understand both are same parties (postfix with '**') and the system is expected to refund the customer to the same supplier (with '**') through payable invoices.

But refund Payable invoice does not have the Supplier Number or Supplier Site and just it has Customer name as a trading partner. so, now as a workaround the business cancels the actual refund invoice, and manual invoice is created for the expected Supplier and Site and pay to the supplier.