Delivery address on Purchase Order Merged

I've had this issue with a couple of clients now; there should be an option when raising or amending a Purchase Order to order the stock to a different address but not be forced to treat the order as direct delivery. Currently, the only way around this is to set up another warehouse with the required delivery address against the stock and order the stock to this warehouse.