Merge pull request #2225 from nabinhait/hotfix

GL Entries for future stock voucher and multiple minor fixes