fixed bug where billing degree for the current month in a previous ye…

…ar was wrong
peterskeide · Feb 5, 2011 · cbe2c40 · cbe2c40
1 parent 4c9d720
commit cbe2c40
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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