[#4477] Add FixedBudget items into the total and profit Deliverable calculations

This commit is contained in:
Eric Davis committed 2010-09-17 15:22:53 -07:00
1 parent d78e7b1dc3
commit 2c04ef4f45
4 files changed
+13 -8

No files matched your search

+1 -1
View File
@@ -23,7 +23,7 @@ class FixedDeliverable < Deliverable
# The amount of profit that is budgeted for this deliverable.
# Profit = Total - ( Labor + Overhead + Fixed + Markup )
def profit_budget(date=nil)
budgets = labor_budget_total(date) + overhead_budget_total(date)
budgets = labor_budget_total(date) + overhead_budget_total(date) + fixed_budget_total(date) + fixed_markup_budget_total(date)
(total(date) || 0.0) - budgets
end