fix some bugs
Merge branch 'BookKeppingReport'