Merge pull request #17 from VuongMy/task#5998_v2

finish
Merge branch 'master' of https://github.com/VuongMy/ManagerReports
Merge branch 'master' of https://github.com/VuongMy/ManagerReports
tong hop
task#5990
Merge pull request #19 from trodjngung/task#5990

Task#5990