Merge pull request #1984 from nabinhait/hotfix

Fix for company in chart of accounts