rearranged menus for treasury
Merge branch 'v2.5.04' of https://github.com/ramesesinc/projects into v2.5.04