Apply Fuel Surcharge Based on Pick-up Date

We currently update our Fuel Surcharge rates at the start of the month lasting until the start of the next month with new FSC rates. From the way I understand it, OTM will use the current date to apply the required FSC to a shipment. However, here we like to apply the FSC based on the actual pick up date of the shipment.

As we approach the end of each month, a shipment could actually be picked up at the end of one month but the delivery is completed in the next month. Therefore, the FSC applied by OTM falls in the later month which does not match the way we invoice our customers and are invoiced by our carriers.