diff --git a/app/views/deliverables/_deliverable.html.erb b/app/views/deliverables/_deliverable.html.erb
index adbfdd2..f6d5e29 100644
--- a/app/views/deliverables/_deliverable.html.erb
+++ b/app/views/deliverables/_deliverable.html.erb
@@ -7,6 +7,7 @@
<%= content_tag(:td, deliverable.id) %>
<%= content_tag(:td, h(deliverable.score.to_i), :class => 'score') if allowed_management? %>
<%= content_tag(:td, h(deliverable.subject), :class => 'subject') %>
+ <%= content_tag(:td, number_to_currency(deliverable.budget || 0.0, :precision => 0), :class => 'budget') if allowed_management? %>
<%= content_tag(:td, number_to_currency(deliverable.labor_budget || 0.0, :precision => 0), :class => 'budget') if allowed_management? %>
<%= content_tag(:td, number_to_currency(deliverable.spent, :precision => 0), :class => 'spent') if allowed_management? %>
<%= content_tag(:td, format_date(deliverable.due), :class => 'due_date') %>
@@ -66,7 +67,7 @@
-
+ |
<%= row_with_data(l(:label_issue_plural), deliverable.issues.size, 'issue-totals') -%>
@@ -77,7 +78,7 @@
- |
+ |
<%= l(:field_description) %>: <%= textilizable deliverable.description %>
|
diff --git a/app/views/deliverables/_list.html.erb b/app/views/deliverables/_list.html.erb
index 5349be6..eed5476 100644
--- a/app/views/deliverables/_list.html.erb
+++ b/app/views/deliverables/_list.html.erb
@@ -4,7 +4,8 @@
<%= sort_header_tag("#{Deliverable.table_name}.id", :caption => '#', :default_order => 'desc') %>
<%= sort_header_tag("score", :caption => l(:caption_score), :default_order => 'desc') if allowed_management? %>
<%= sort_header_tag("#{Deliverable.table_name}.subject", :caption => l(:caption_subject)) %>
- <%= sort_header_tag("labor_budget", :caption => l(:caption_budget)) if allowed_management? %>
+ <%= sort_header_tag("total_budget", :caption => l(:caption_budget)) if allowed_management? %>
+ <%= sort_header_tag("labor_budget", :caption => l(:caption_labor_budget)) if allowed_management? %>
<%= sort_header_tag("spent", :caption => l(:caption_spent)) if allowed_management? %>
<%= sort_header_tag("#{Deliverable.table_name}.due", :caption => l(:caption_due)) %>
<%= sort_header_tag("progress", :caption => l(:caption_progress)) %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b411999..43052d6 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -28,6 +28,7 @@ en:
caption_subject: Subject
caption_score: Score
caption_budget: Budget
+ caption_labor_budget: Labor Budget
caption_spent: Spent
label_update_deliverable: Update Deliverable
label_labor_budget: "Labor Budget: "
diff --git a/lang/en.yml b/lang/en.yml
index f4bf4ac..cb0d253 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -27,6 +27,7 @@ caption_progress: Progress
caption_subject: Subject
caption_score: Score
caption_budget: Budget
+caption_labor_budget: Labor Budget
caption_spent: Spent
label_update_deliverable: Update Deliverable
label_labor_budget: "Labor Budget: "
|