Ability to advance a workflow step based on more than one criteria

[#1]

Need the ability to move the workflow to the next stage based on deadline or decisions made. Currently you can set one or the other, not both.