Merge pull request #4961 from nabinhait/fix_658

[fix] Rearranged position of mode_of_payment in sales invoice