Merged r18743 to 4.0-stable (#31779).

git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18744 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/models/issue_query.rb

@@ -227,6 +227,7 @@ class IssueQuery < Query
     end
 
     disabled_fields = Tracker.disabled_core_fields(trackers).map {|field| field.sub(/_id$/, '')}
+    disabled_fields << "total_estimated_hours" if disabled_fields.include?("estimated_hours")
     @available_columns.reject! {|column|
       disabled_fields.include?(column.name.to_s)
     }