refactoring in form report for period (user)
Merge remote-tracking branch 'origin/master'