Changed the Timelogs to use both the Systemwide and Project specific TimeEntryActivities

* Added Project#activities to return all the Systemwide and Project specific
  activities, excluding Systemwide ones that are overridden.
* Added some tests for TimelogHelper.

  #4077

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2948 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/models/enumeration.rb

@@ -62,7 +62,7 @@ class Enumeration < ActiveRecord::Base
 
   named_scope :active, lambda {
     {
-      :conditions => {:active => true},
+      :conditions => {:active => true, :project_id => nil},
       :order => 'position'
     }
   }