Merge pull request #1324 from nabinhait/hotfix

Minor Fix
Merge pull request #1326 from nabinhait/hotfix

Calculate taxes and charges total in server side
bumped to version 3.6.2
Merge branch 'develop'
Merge branch 'develop' of github.com:webnotes/erpnext into hotfix
Do not set income/expense account automatically in company master
Priority to user's deafult price list over customer's default price list