Stock movement with Shipment
StockManager and Shipment improvements