EST-369: Improve invoice calculation workflow