Support separate cashbook for user with both collector and liquidating officer role
Merge branch 'master' of https://github.com/ramesesinc/etracs2.5