Merge pull request #5209 from umairsy/field-arrangment

address and contact related fields re-arranged in the sales transacti…