[#2253] Rearrange To/From fields and depend on is_recurring in SI,SO,PI,PO
Merge pull request #2261 from ankitjavalkarwork/sopofield

[#2253] Rearrange To/From fields and depend on is_recurring