Fixing total row
Merge branch 'unissued' into testing