Subcontractors shipping address on PO's

With our subcontracting we have many items that are shipped from one sub to the next sub to complete different stages of a build. I want to add a new shipping address on the PO for where the item is to be shipped to. I see that there is a shipping address field already but it only shows address’ that have “Is your company address” checked.

It seems to me that the most efficient way to do this is to make duplicate address’ for suppliers that have “Is your company address” checked, much like making Warehouses. Is there a better way though?

I guess this is how you will have to do it for now. Address for which “Is Your Company Address” is checked will be visible in the Shipping Address field of Purchase Order.