[#4420] Added a Deliverable finance form for each Retainer month.

app/models/retainer_deliverable.rb

@@ -44,7 +44,15 @@ class RetainerDeliverable < HourlyDeliverable
     
     month_acc
   end
-  
+
+  def labor_budgets_for_date(date)
+    labor_budgets.all(:conditions => {:year => date.year, :month => date.month})
+  end
+
+  def overhead_budgets_for_date(date)
+    overhead_budgets.all(:conditions => {:year => date.year, :month => date.month})
+  end
+
   def create_budgets_for_periods
     # For each month in the time span
     months.each do |month|

app/views/deliverables/_finance_form.html.erb

@@ -1,10 +1,10 @@
-<% form.inputs :name => l(:text_deliverable_finances), :id => 'deliverable-finances' do %>
+<% form.inputs :name => label, :class => 'deliverable-finances' do %>
 
   <li class="numeric optional">
     <%= content_tag(:label, l(:field_labor)) %>
     <table id="deliverable-labor" class="deliverable_finance_table">
 
-      <% form.fields_for :labor_budgets do |labor_budget| %>
+      <% form.fields_for :labor_budgets, labor_budgets do |labor_budget| %>
       <tr>
         <%# TODO: Select field for the Time Entry Activity in a td %>
         <td>
@@ -31,7 +31,7 @@
     <%= content_tag(:label, l(:field_overhead)) %>
     <table id="deliverable-overhead" class="deliverable_finance_table">
       
-      <% form.fields_for :overhead_budgets do |overhead_budget| %>
+      <% form.fields_for :overhead_budgets, overhead_budgets do |overhead_budget| %>
       <tr>
         <%# TODO: Select field for the Time Entry Activity in a td %>
         <td>

app/views/deliverables/_form.html.erb

@@ -28,7 +28,13 @@
   <% end %>
 <% end %>
 
-<%= render :partial => 'finance_form', :locals => {:form => form, :resource => resource} %>
+<% if resource.retainer? %>
+<% resource.months.each do |month| %>
+<%= render :partial => 'finance_form', :locals => {:form => form, :labor_budgets => resource.labor_budgets_for_date(month), :overhead_budgets => resource.overhead_budgets_for_date(month), :label => l(:text_deliverable_finances_date, :date => month.strftime("%B, %Y")) } %>
+<% end %>
+<% else %>
+<%= render :partial => 'finance_form', :locals => {:form => form, :labor_budgets => resource.labor_budgets, :overhead_budgets => resource.overhead_budgets, :label => l(:text_deliverable_finances) } %>
+<% end %>
 
 </div>