Add extra field for shipment date, and change the criteria so that ETA c...

...an be any date after shipment date