fix finance cheque status on dashboard
merging
fix CATS-399, CATS:402
Merge branch 'master' of https://github.com/EdgeComputing/cats
Merge branch 'master' of https://github.com/EdgeComputing/cats
fix error on requisition
Merge branch 'master' of https://github.com/EdgeComputing/cats