Fix date format
Merge branch 'hotfix/fix_bugs_in_report_generate'