small changes in models DeliverOrder and OrderToShipment