diff --git a/app/views/deliverables/_finance_form.html.erb b/app/views/deliverables/_finance_form.html.erb index 5b4da66..c2331d0 100644 --- a/app/views/deliverables/_finance_form.html.erb +++ b/app/views/deliverables/_finance_form.html.erb @@ -14,7 +14,7 @@ <%= content_tag(:label, l(:field_labor)) %> - <% form.fields_for :labor_budgets, labor_budgets do |labor_budget| %> + <% form.fields_for :labor_budgets, labor_budgets.sort_by(&:id) do |labor_budget| %> <%= render :partial => 'labor_budget_form', :locals => {:labor_budget => labor_budget} %> <% end %> diff --git a/app/views/deliverables/_form.html.erb b/app/views/deliverables/_form.html.erb index 25369a6..e0a1dbc 100644 --- a/app/views/deliverables/_form.html.erb +++ b/app/views/deliverables/_form.html.erb @@ -62,7 +62,7 @@ <%= content_tag(:p, l(:text_missing_period), :class => 'nodata') %> <% end %> <% else %> -<%= render :partial => 'finance_form', :locals => {:form => form, :labor_budgets => resource.labor_budgets.all(:order => 'id asc'), :overhead_budgets => resource.overhead_budgets, :fixed_budgets => resource.fixed_budgets, :label => l(:text_deliverable_finances), :fieldset_class => '' } %> +<%= render :partial => 'finance_form', :locals => {:form => form, :labor_budgets => resource.labor_budgets, :overhead_budgets => resource.overhead_budgets, :fixed_budgets => resource.fixed_budgets, :label => l(:text_deliverable_finances), :fieldset_class => '' } %> <% end %>