[#2279] Hooked up the Billable filter to adjust the Timesheet's Activities.

* Hooked into the TimesheetController to modify the Timesheet activities
* Added TimeEntryActivity#find_with_billable_values to find all the TimeEntryActivities
  which have the value in the billable custom field.

lib/overhead_time_entry_activity_patch.rb

@@ -23,6 +23,22 @@ module OverheadTimeEntryActivityPatch
     def overhead_configured?
       Setting['plugin_redmine_overhead'] && Setting['plugin_redmine_overhead']['custom_field']
     end
+
+    def find_with_billable_values(values = [])
+      return [] unless overhead_configured?
+
+      billable_field = TimeEntryActivity.billable_custom_field
+      if billable_field
+        finder = ARCondition.new
+        finder.add "#{CustomValue.table_name}.customized_type = '#{TimeEntryActivity.class_name}'"
+        finder.add ["#{CustomValue.table_name}.custom_field_id = ?", billable_field.id]
+        finder.add ["#{CustomValue.table_name}.value IN (?)", values]
+        
+        return TimeEntryActivity.find(:all, :include => :custom_values, :conditions => finder.conditions)
+      else
+        return []
+      end
+    end
   end
   
   module InstanceMethods

lib/overhead_timesheet_hook.rb

@@ -41,4 +41,11 @@ class OverheadTimesheetHook < Redmine::Hook::ViewListener
                                 :selected_values => selected_values
                               })
   end
+
+  def plugin_timesheet_controller_report_pre_fetch_time_entries(context = {})
+    if context[:params] && context[:params][:timesheet] && context[:params][:timesheet][:billable]
+      activities = TimeEntryActivity.find_with_billable_values(context[:params][:timesheet][:billable])
+      context[:timesheet].activities = activities.collect(&:id) unless activities.empty?
+    end
+  end
 end