fix shipment error & edit error