[#4555] Include the spent FixedBudget in Hourly and Retainers total_spent

app/models/hourly_deliverable.rb

@@ -37,7 +37,8 @@ class HourlyDeliverable < Deliverable
       total
     }
 
-    return hours * contract.billable_rate
+    fixed_budget_amount = fixed_budget_total_spent(date) + fixed_markup_budget_total_spent(date)
+    return (hours * contract.billable_rate) + fixed_budget_amount
   end
   
   # Block setting the total on HourlyDeliverables

app/models/retainer_deliverable.rb

@@ -198,7 +198,9 @@ class RetainerDeliverable < HourlyDeliverable
         total
       }
 
-      return hours * contract.billable_rate
+      fixed_budget_amount = fixed_budget_total_spent(date) + fixed_markup_budget_total_spent(date)
+
+      return (hours * contract.billable_rate) + fixed_budget_amount
     when :out
       0
     else