diff --git a/app/models/period.rb b/app/models/period.rb index 2c9bfbe..a15a3d2 100644 --- a/app/models/period.rb +++ b/app/models/period.rb @@ -47,7 +47,7 @@ def activities def find_reported_upto_day today = Date.today - if today.month == @start.month + if today.month == @start.month && today.year == @start.year @user.time_entries.on_day(today).empty? ? today - 1: today elsif today > @end @end