Rename LaborExpenses to LaborBudget, better description of the class.

app/helpers/contracts_helper.rb

@@ -1,7 +1,7 @@
 module ContractsHelper
   def setup_nested_deliverable_records(deliverable)
     returning(deliverable) do |d|
-      d.labor_expenses.build if d.labor_expenses.empty?
+      d.labor_budgets.build if d.labor_budgets.empty?
     end
   end
 end

app/models/deliverable.rb

@@ -4,9 +4,9 @@ class Deliverable < ActiveRecord::Base
   # Associations
   belongs_to :contract
   belongs_to :manager, :class_name => 'User', :foreign_key => 'manager_id'
-  has_many :labor_expenses
+  has_many :labor_budgets
 
-  accepts_nested_attributes_for :labor_expenses
+  accepts_nested_attributes_for :labor_budgets
   
   # Validations
   validates_presence_of :title

app/models/labor_expense.rb

@@ -1,4 +1,4 @@
-class LaborExpense < ActiveRecord::Base
+class LaborBudget < ActiveRecord::Base
   unloadable
 
   # Associations

app/views/deliverables/_form.html.erb

@@ -24,10 +24,10 @@
   <%= form.input :total, :input_html => {:size => 10}, :wrapper_html => {:class => 'deliverable_total_input'} %>
 
   <% form.inputs :name => l(:text_deliverable_finances), :id => 'deliverable-finances' do %>
-    <% form.semantic_fields_for :labor_expenses do |labor_expense| %>
-      <% labor_expense.inputs :name => l(:field_labor) do %>
-        <%= labor_expense.input :hours, :label => l(:text_short_hours), :input_html => {:size => 10} %>
-        <%= labor_expense.input :budget, :label => l(:text_dollar_sign), :input_html => {:size => 10} %>
+    <% form.semantic_fields_for :labor_budgets do |labor_budget| %>
+      <% labor_budget.inputs :name => l(:field_labor) do %>
+        <%= labor_budget.input :hours, :label => l(:text_short_hours), :input_html => {:size => 10} %>
+        <%= labor_budget.input :budget, :label => l(:text_dollar_sign), :input_html => {:size => 10} %>
       <% end %>
     <% end %>
   <% end %>

db/migrate/004_create_labor_expenses.rb

@@ -1,16 +1,16 @@
-class CreateLaborExpenses < ActiveRecord::Migration
+class CreateLaborBudgets < ActiveRecord::Migration
   def self.up
-    create_table :labor_expenses do |t|
+    create_table :labor_budgets do |t|
       t.decimal :hours, :precision => 15, :scale => 4
       t.decimal :budget, :precision => 15, :scale => 4
       t.references :deliverable
       t.timestamps
     end
 
-    add_index :labor_expenses, :deliverable_id
+    add_index :labor_budgets, :deliverable_id
   end
 
   def self.down
-    drop_table :labor_expenses
+    drop_table :labor_budgets
   end
 end

test/integration/deliverables_edit_test.rb

@@ -73,10 +73,10 @@ class DeliverablesEditTest < ActionController::IntegrationTest
     assert @hourly_deliverable.reload.warranty_sign_off?
     assert @hourly_deliverable.reload.feature_sign_off?
 
-    assert_equal 1, @hourly_deliverable.labor_expenses.count
-    @labor_expense = @hourly_deliverable.labor_expenses.first
-    assert_equal 20, @labor_expense.hours
-    assert_equal 2000.0, @labor_expense.budget
+    assert_equal 1, @hourly_deliverable.labor_budgets.count
+    @labor_budget = @hourly_deliverable.labor_budgets.first
+    assert_equal 20, @labor_budet.hours
+    assert_equal 2000.0, @labor_budget.budget
 
   end
 end

test/integration/deliverables_new_test.rb

@@ -112,7 +112,7 @@ class DeliverablesNewTest < ActionController::IntegrationTest
 
   end
 
-  should "create new expenses for the deliverables" do
+  should "create new budget item for the deliverables" do
     @manager = User.generate!
     @role = Role.generate!
     User.add_to_project(@manager, @project, @role)
@@ -137,10 +137,10 @@ class DeliverablesNewTest < ActionController::IntegrationTest
     assert_template 'contracts/show'
 
     @deliverable = Deliverable.last
-    assert_equal 1, @deliverable.labor_expenses.count
-    @labor_expense = @deliverable.labor_expenses.first
-    assert_equal 20, @labor_expense.hours
-    assert_equal 2000.0, @labor_expense.budget
+    assert_equal 1, @deliverable.labor_budgets.count
+    @labor_budget = @deliverable.labor_budgets.first
+    assert_equal 20, @labor_budget.hours
+    assert_equal 2000.0, @labor_budget.budget
   end
 
 end

test/unit/deliverable_test.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../test_helper'
 class DeliverableTest < ActiveSupport::TestCase
   should_belong_to :contract
   should_belong_to :manager
-  should_have_many :labor_expenses
+  should_have_many :labor_budgets
 
   should_validate_presence_of :title
   should_validate_presence_of :type

test/unit/labor_expense_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class LaborExpenseTest < ActiveSupport::TestCase
+class LaborBudgetTest < ActiveSupport::TestCase
   should_belong_to :deliverable
 
   context "#budget=" do