year report fix
Merge branch 'master' of localhost:cashflow