Merge branch 'master' into 6636-deliverable-report

When the deliverable form isn't saved (validation errors) then
the unsaved budgets would cause sorting errors due to nil ids.

app/views/deliverables/_finance_form.html.erb

@@ -26,7 +26,7 @@
     <%= content_tag(:label, l(:field_labor)) %>
     <table id="deliverable-labor" class="deliverable_finance_table">
       <tbody>
-      <% form.fields_for :labor_budgets, labor_budgets.sort_by(&:id) do |labor_budget| %>
+      <% form.fields_for :labor_budgets, labor_budgets.sort_by {|b| b.id || 0 } do |labor_budget| %>
         <%= render :partial => 'labor_budget_form', :locals => {:labor_budget => labor_budget} %>
       <% end %>
       </tbody>
@@ -37,7 +37,7 @@
     <%= content_tag(:label, l(:field_overhead)) %>
     <table id="deliverable-overhead" class="deliverable_finance_table">
       <tbody>
-      <% form.fields_for :overhead_budgets, overhead_budgets.sort_by(&:id) do |overhead_budget| %>
+      <% form.fields_for :overhead_budgets, overhead_budgets.sort_by {|b| b.id || 0 } do |overhead_budget| %>
         <%= render :partial => 'overhead_budget_form', :locals => {:overhead_budget => overhead_budget} %>
       <% end %>
       </tbody>
@@ -48,7 +48,7 @@
     <div id="deliverable-fixed" class="fixed-item-form">
 		  <label for="contract_discount">Fixed</label>
 
-      <% form.fields_for :fixed_budgets, fixed_budgets.sort_by(&:id) do |fixed_budget| %>
+      <% form.fields_for :fixed_budgets, fixed_budgets.sort_by {|b| b.id || 0 } do |fixed_budget| %>
         <%= render :partial => 'fixed_budget_form', :locals => {:fixed_budget => fixed_budget} %>
         <%= wikitoolbar_for "fixed-description#{fixed_budget.object.object_id}" %>
       <% end %>

app/views/deliverables/_finances.html.erb

@@ -2,7 +2,7 @@
   <%= l(:text_deliverable_spending_summary,
         :spent => content_tag(:span, h(number_to_currency(deliverable.labor_budget_spent, :precision => Deliverable::ViewPrecision)), :class => 'spent'),
         :total => content_tag(:span, h(number_to_currency(deliverable.labor_budget_total, :precision => Deliverable::ViewPrecision)), :class => 'total'),
-        :hours => content_tag(:span, h(deliverable.labor_hours_spent_total), :class => 'hours')) %>
+        :hours => content_tag(:span, h(number_with_precision(deliverable.labor_hours_spent_total, :precision => Deliverable::ViewPrecision)), :class => 'hours')) %>
 </div>
 
 <h2><%= h(deliverable.title) %></h2>