Shipping Assets within locations

Basically we ship our equipment out to rent for about a week to a location where we have a tech onsite. Then we ship it back to our home location for maintenance and configuration for the next custom location. When I create a shipment, it automatically removes my assets from asset list, which I understand if I were selling the product, but in this case I am in possession of the product for the entire duration. I would like the ability to create shipments between locations, So I can track what is currently in transit between locations, then have the ability to "receive" the shipment onsite. I understand there is a move location under assets, But the action is instant and does not allow me to track it when it is in transit and "receive" it when it arrives. While in transit the product is out of my inventory and inaccessible and takes a few days to get to it's new location. And of course my requirements are just slightly different then most warehouse's, though I am sure there are companies out there that would like a shipment from "warehouse" to "warehouse", or "warehouse" to "store" feature.