Use ShipmentCostMixin for supplier shipment
Both modules add almost the same field to each shipments with only the cost currency which is only on supplier shipment. I think it will be good to also store the cost in carrier currency on customer shipments. So we could have a single mixin with the common part.