Packing Slip Template needs to have the "Ship From" address listed

On the current Packing Slip template the "Ship From" address pulls from the company's address which is not always where the product is shipping from.  We need to be able to select the correct "Ship From" location so our carriers can have all of the necessary information on the packing slip from the beginning.  As a work around I was told to include the address in the 'Name' field within the location's settings - this solves the issue for the time being but is not a sustainable solution.  Can this packing slip be updated please?  Thanks!