[#4777] Add fixed budgets to the profit_left calculations

app/models/fixed_deliverable.rb

@@ -28,9 +28,9 @@ class FixedDeliverable < Deliverable
   end
 
   # The amount of money remaining after expenses have been taken out
-  # Profit left = Total - Labor spent - Overhead spent
+  # Profit left = Total - Labor spent - Overhead spent - Fixed - Markup
   def profit_left(date=nil)
-    total_spent(date) - labor_budget_spent(date) - overhead_spent(date)
+    total_spent(date) - labor_budget_spent(date) - overhead_spent(date) - fixed_budget_total_spent(date) - fixed_markup_budget_total_spent(date)
   end
   
   # Hardcoded value used as a wrapper for the old Budget plugin API.

app/models/hourly_deliverable.rb

@@ -57,8 +57,8 @@ class HourlyDeliverable < Deliverable
   end
 
   # The amount of money remaining after expenses have been taken out
-  # Profit left = Total - Labor spent - Overhead spent
+  # Profit left = Total - Labor spent - Overhead spent - Fixed - Markup
   def profit_left(date=nil)
-    total_spent(date) - labor_budget_spent(date) - overhead_spent(date)
+    total_spent(date) - labor_budget_spent(date) - overhead_spent(date) - fixed_budget_total_spent(date) - fixed_markup_budget_total_spent(date)
   end
 end