Merge pull request #1246 from nabinhait/hotfix

General Ledger and more