[#2253] Rearrange To/From fields and depend on is_recurring in SI,SO,PI,PO