Refactor: pull up method

2010-09-23 10:18:44 -07:00
parent ed9f73e8a0
commit b8d7c15b39
3 changed files with 4 additions and 15 deletions
@@ -69,8 +69,11 @@ class Deliverable < ActiveRecord::Base
    overhead_budgets.sum(:budget)
  end

+  # The amount of profit that is budgeted for this deliverable.
+  # Profit = Total - ( Labor + Overhead + Fixed + Markup )
  def profit_budget(date=nil)
-    nil
+    budgets = labor_budget_total(date) + overhead_budget_total(date) + fixed_budget_total(date) + fixed_markup_budget_total(date)
+    (total(date) || 0.0) - budgets
  end

  def labor_budget_hours(date=nil)