Procurement shipment tracking

This is a bit open ended, but here goes:

For Open Purchase Orders when a vendor ships product we would like to be able to do the following: (I should add the shipment notification from the vendor may be an email/phone call etc... Nothing automatic)

1. Apply a shipment number/Container number to the lines that have shipped
   1. This may include lines from multiple PO's.
2. If partial Qty's have shipped, we would like to enter the Shipped qty, and have the line split (assigning the container ID/Shipment ID only to the shipped qty)
3. Apply a shipped date to those PO lines (either by virtue of having added the shipment number/container ID, or manually).