Renamed Deliverable.due_date to due so it doesn't conflict with issue.due_date

app/views/deliverables/_deliverable.html.erb

@@ -5,7 +5,7 @@
         <%= content_tag(:td, h(deliverable.subject), :class => 'subject') %>
         <%= content_tag(:td, number_to_currency(deliverable.budget, :precision => 0), :class => 'budget') %>
         <%= content_tag(:td, number_to_currency(deliverable.spent, :precision => 0), :class => 'spent') %>
-        <%= content_tag(:td, format_date(deliverable.due_date), :class => 'due_date') %>
+        <%= content_tag(:td, format_date(deliverable.due), :class => 'due_date') %>
         <%= content_tag(:td, progress_bar(deliverable.progress, :width => '100%', :class => 'dont_ratio')) %>
         <%= content_tag(:td, link_to_function("Details", "$('deliverable-details-#{deliverable.id}').toggle();"), :class => 'actions') %>
     </tr>

app/views/deliverables/_form.html.erb

@@ -7,7 +7,7 @@
           :rows => (@deliverable.description.blank? ? 10 : [[10, @deliverable.description.length / 50].max, 100].min),
           :accesskey => accesskey(:edit),
         :class => 'wiki-edit' %></p>
-        <p><%= f.text_field :due_date, :size => 10 %><%= calendar_for('deliverable_due_date') %></p>
+        <p><%= f.text_field :due, :size => 10 %><%= calendar_for('deliverable_due') %></p>
 
         <p><%= f.check_box(:project_manager_signoff) %></p>
         <p><%= f.check_box(:client_signoff) %></p>

app/views/deliverables/_list.html.erb

@@ -5,7 +5,7 @@
       <%= sort_header_tag("#{Deliverable.table_name}.subject", :caption => 'Subject') %>
       <%= sort_header_tag("#{Deliverable.table_name}.budget", :caption => 'Budget') %>
       <%= sort_header_tag("spent", :caption => 'Spent') %>
-      <%= sort_header_tag("#{Deliverable.table_name}.due_date", :caption => 'Due') %>
+      <%= sort_header_tag("#{Deliverable.table_name}.due", :caption => 'Due') %>
       <%= sort_header_tag("progress", :caption => 'Progress') %>
       <%= content_tag('th', "Actions") %>
     </tr></thead>