Date filter linked to two date columns

i am looking to create a date filter that relates to different date collumns based on the metric. 

work orders are completed and then billed 45 days later. if i use completion date the revenue isnt accuate because the work has not been billed. 

 Metrics regarding work orders would refer to completion date and   Metrics regarding finance would refer to invioce date both would be controlled under the same date filter