[#6574] Associate LaborBudgets with TimeEntryActivities

app/models/labor_budget.rb

@@ -3,8 +3,10 @@ class LaborBudget < ActiveRecord::Base
 
   # Associations
   belongs_to :deliverable
+  belongs_to :time_entry_activity
 
   # Validations
+  validates_presence_of :time_entry_activity_id
 
   # Accessors
   include DollarizedAttribute

app/views/deliverables/_finance_form.html.erb

@@ -13,7 +13,8 @@
         <%= labor_budget.hidden_field(:month) %>
       <tr>
         <td>
-          <%= release(3, "Select field for the Time Entry Activity in a td") %>
+          <%= labor_budget.label(:time_entry_activity_id, :class => "hidden") %>
+          <%= labor_budget.select(:time_entry_activity_id, options_from_collection_for_select(@project.billable_activities, :id, :name, labor_budget.object.time_entry_activity_id), {:include_blank => false}, {:class => 'financial'}) %>
         </td>
         <td>
           <p class="inline-hints"><%= labor_budget.label(:hours, l(:text_short_hours)) %></p>