Knowledge Management

Question:
Does anybody know how to default an OA partner in a vendor return?
I have an OA Partner (ordering party) in my purchase order which is different from the VN partner (vendor) because the goods are coming from a different site.
I have customers associated with each partner.
Hence the PO looks something like:
Vendor (VN) = 12345, with associated customer 9876
Ordering Party (OA) = 45678, with associated customer 4321
I goods receipt the PO with MIGO. I then do a vendor return through MIGO & a subsequent SD delivery. I get the delivery going to customer 9876. (I.e. the vendor) It is physically going back to the OA partner or customer 4321.
There appears to be no way of getting the OA partner defaulting in the return delivery?
Hence the address on the return documentation (which comes from the customer record) is that of the VN partner (or head office) and not the OA partner (or physical branch where the goods came from & are going back to).
Has anybody come across this scenario before?
Answer:
I have not been involved in a senario like this but have you tried making a goods supplier (GS) for the vendor that is the same as the order address (OA).
This would atleast tell the system that the actually goods were received from the GS rather then the VN and then the Ship to on the return should be the customer 4321 since the GS is 45678.
I do not have access to a system at this moment but this at least seems logical.
If not already there you may have to add GS to the partner schema.
Hope this works