Merge pull request #1326 from nabinhait/hotfix

Calculate taxes and charges total in server side