Merge pull request #946 from joshuajan/7.0_hr_holidays_report_fix