backlog 0.36.2 → 0.37.1

data/app/views/tasks/_form.rhtml

@@ -1,20 +1,20 @@
 <!--[form:task]-->
 <p>
-<% if @task.backlog.nil? || @task.new_record? || @task.active? %>
-  <label for="task_backlog_id"><%=l :backlog%></label><br/>
-  <%= select 'task', 'backlog_id', [['', '']] + @backlogs.map{|backlog| [backlog.name, backlog.id]}, {}, :onchange => "form.action = '#{url_for}'; form.submit();" %>
+<% if @task.project.nil? || @task.new_record? || @task.active? %>
+  <label for="task_project_id"><%=l :project%></label><br/>
+  <%= select 'task', 'project_id', [['', '']] + @projects.map{|project| [project.name, project.id]}, {}, :onchange => "form.action = '#{url_for}'; form.submit();" %>
 <% else %>
-  <label for="task_backlog_id"><%=l :backlog%></label>:
-  <%=hidden_field 'task', 'backlog_id' %><%=detour_to h(@task.backlog.name), :controller => 'backlogs', :action => :show, :id => @task.backlog_id %>
+  <label for="task_project_id"><%=l :project%></label>:
+  <%=hidden_field 'task', 'project_id' %><%=detour_to h(@task.project.name), :controller => 'projects', :action => :show, :id => @task.project_id %>
 <% end %>
-<% if @task.backlog %>
-  <%=image_detour_to('clipboard.png', "#{l(:backlog)} #{@task.backlog.name}", {:controller => 'backlogs', :action => :edit, :id => @task.backlog}, {:class => 'image-submit', :style => 'vertical-align: bottom'}) %>
+<% if @task.project %>
+  <%=image_detour_to('clipboard.png', "#{l(:project)} #{@task.project.name}", {:controller => 'projects', :action => :edit, :id => @task.project}, {:class => 'image-submit', :style => 'vertical-align: bottom'}) %>
 <% end %>
-<%=detour_to l(:new_backlog), :controller => 'backlogs', :action => :new %>
+<%=detour_to l(:new_project), :controller => 'projects', :action => :new %>
 </p>
 
 
-<% if @task.backlog && @task.backlog.enable_periods? %>
+<% if @task.project && @task.project.enable_periods? %>
 <p><label for="task_period_id"><%=l :period%></label><br/>
 <% if @task.active? %>
 <%= select 'task', 'period_id', [['', '']] + @periods.map{|p| [p.name, p.id]}, {},
@@ -31,7 +31,7 @@
 <% end %>
 
 
-<% if @task.backlog %>
+<% if @task.project %>
 
 <p><label for="task_description"><%=l :task%> #<%=@task.id%></label><br/>
 <% if @task.active? -%>
@@ -68,13 +68,13 @@
 <% end %>
 
 <% if @task.total_done != 0 -%>
-  <p style="float: left"><%=l :done%></label><br/>
+  <p style="float: left"><%=l :done%><br/>
     <%=t @task.total_done%>
   </p>
 <% end %>
 <br clear="all" />
 
-<% if @task.backlog.enable_users? %>
+<% if @task.project.enable_users? %>
   <% unless @task.new_record? %>
     <p><label><%=l :ownership%></label><br/>
     	<%= if @task.users.empty?
@@ -121,5 +121,5 @@ end.join(' ')%><br clear="all"/>
 
 
 <script type="text/JavaScript">
-document.getElementById('<%=@task.backlog.nil? ? 'task_backlog_id' : @task.period.nil? ? 'task_period_id' : (@task.description.nil? || @task.description.empty?) ? 'task_description' : 'task_notes' %>').focus();
+document.getElementById('<%=@task.project.nil? ? 'task_project_id' : @task.period.nil? ? 'task_period_id' : (@task.description.nil? || @task.description.empty?) ? 'task_description' : 'task_notes' %>').focus();
 </script>

data/app/views/tasks/_task.rhtml

@@ -1,5 +1,5 @@
   <li id="task_<%=task.id%>"<%=' class="tasks" onmouseover="this.style.border=\'1px solid black\'" onmouseout="this.style.border=\'1px solid transparent\'"' if active && (task.period.nil? || task.period.active_or_future?) && (not task.work_started?) %><%=' class="highlight"' if highlight_task %><%=' style="display: none"' if hidden %>>
-    <div style="float: left" style="border: 0px">
+    <div style="float: left" style="border: 0">
     <% if task.enable_subtasks? && active && (task.period.nil? || task.period.active_or_future?) %>
       <% form_tag({:controller => 'tasks', :action => :specify, :id => task}) do %>
         <%=image_button_to('add.png', l(:specify), {:controller => 'tasks', :action => :specify, :id => task.id}, 
@@ -17,9 +17,9 @@
 	</div>
 	<div id="task_<%=task.id%>_description" class="task_description">
    		<b><%=h(task.description)%></b>
-		<% if show_backlog %>
+		<% if show_project %>
 			<br/>
-			<%=l :backlog%>: <%=detour_to(h(task.backlog.name), :controller => 'backlogs', :action => :show, :id => task.backlog) %>
+			<%=l :project%>: <%=detour_to(h(task.project.name), :controller => 'projects', :action => :show, :id => task.project) %>
 		<% end %>
 	</div>
 
@@ -29,13 +29,13 @@
     <div class="task_start">
       <% if active && task.loggable? -%>
           <% if task.work_started? -%>
-            <% remote_form_for(:work, :url => {:controller => 'works', :action => 'update_time', :id => task.started_work}) do |f| %>
+            <%=form_for(:work, :remote => true, :url => {:controller => 'works', :action => 'update_time', :id => task.started_work}) do |f| %>
               <%=submit_tag('checkmark', :value => l(:save), :style => 'display: none')%>
               <%=f.text_field 'start_time', :id => "work_#{task.started_work.id}_start_time", :tabindex => i+1, :value => (task.started_work.start_time ? task.started_work.start_time.strftime('%H:%M') : ''),
                   :class => :task_time, :maxlength => 5 %>
             <% end %>
           <% elsif task.track_times? && (task.period_id.nil? || task.period.active?) %>
-            <%=image_link_to_remote 'hammer.png', l(:start_work), {:url => with_detour({:controller => 'tasks', :action => :start_work, :id => task.id})}, nil, true %>
+            <%=image_link_to_remote 'hammer.png', l(:start_work), with_detour({:controller => 'tasks', :action => :start_work, :id => task.id}), nil, true %>
 	      <% else -%>
     		&nbsp;
           <% end -%>
@@ -45,7 +45,7 @@
     </div>
     <div class="task_end_work">
       <% if active && task.loggable? && task.work_started? -%>
-        <% form_tag({:controller => 'works', :action => 'update', :id => task.started_work}) do %>
+        <%=form_tag({:controller => 'works', :action => 'update', :id => task.started_work}) do %>
           <%= image_detour_to('ernes_stop.png', l(:end_work), {:controller => 'tasks', :action => :end_work, :id => task.id}, nil, true) %>
         <% end -%>
 	  <% else %>
@@ -72,7 +72,7 @@
       <% if active && task.loggable? -%>
           <% if task.track_todo? -%>
             <% if task.period.nil? || task.period.active_or_future? -%>
-              <% remote_form_for(:estimate, :url => {:action => :update_task_estimate, :id => task}) do |f| -%>
+              <% form_for(:estimate, :remote => true, :url => {:action => :update_task_estimate, :id => task}) do |f| -%>
                 <%=f.text_field :todo, :tabindex => i+2, :id => "task_#{task.id}_todo", :value => task.todo, :class => :task_hours, :maxlength => 4 %>
               <% end -%>
             <% else -%>
@@ -89,14 +89,14 @@
         <% if task.active? -%>
           <% if task.loggable? -%>
             <% unless task.work_started? -%>
-			  <% if task.backlog.enable_users? %>
+			  <% if task.project.enable_users? %>
 			  	<% if task.users.include?(current_user) %>
 	              <%=image_link_to_remote('grab.png', l(:release_task), {:url => with_detour({:controller => 'tasks', :action => :release, :id => task})}, nil, true)%>
 			  	<% else %>
 	              <%=image_link_to_remote('grab_gray.png', "#{l:grab_task} #{" (#{l :not_grabbed})" if task.users.empty?}", {:url => with_detour({:controller => 'tasks', :action => :grab, :id => task})}, nil, true)%>
 			  	<% end %>
 			  <% end %>
-              <%=image_link_to_remote('arrow_right.png', l(:move_to_next_period), {:url => {:action => :move_task_to_next_period, :id => task}}, nil, true) if task.backlog.enable_periods? || task.period_id%>
+              <%=image_link_to_remote('arrow_right.png', l(:move_to_next_period), {:controller => 'periods', :action => :move_task_to_next_period, :id => task}, nil, true) if task.project.enable_periods? || task.period_id%>
               <%=image_link_to_remote('ernes_stop.png', l(:abort), {:url => {:action => :abort_task, :id => task}}, nil, true)%>
             <% end -%>
           <% end -%>
@@ -111,6 +111,6 @@
   </li>
 
   <% for subtask in task.children %>
-    <%=render :partial => '/tasks/task', :locals => { :task => subtask, :i => i, :active => active, :hidden => false, :show_backlog => false, :highlight_task => subtask == @selected_task, :update => update } if (active && subtask.active?) || (!active && subtask.completed?) %>
+    <%=render :partial => '/tasks/task', :locals => { :task => subtask, :i => i, :active => active, :hidden => false, :show_project => false, :highlight_task => subtask == @selected_task, :update => update } if (active && subtask.active?) || (!active && subtask.completed?) %>
     <% i += 1 %>
   <% end %>

data/app/views/tasks/edit.rhtml

@@ -51,7 +51,7 @@
           <% if @task.loggable? -%>
             <% unless @task.work_started? -%>
       <%# form_tag({:controller => 'tasks', :action => 'update', :id => @task}) do -%>
-              <%=image_link_to_remote('arrow_right.png', l(:move_to_next_period), {:url => {:action => :move_task_to_next_period, :id => @task}}, nil, true) if @task.backlog.enable_periods? || @task.period_id%>
+              <%=image_link_to_remote('arrow_right.png', l(:move_to_next_period), {:url => {:action => :move_task_to_next_period, :id => @task}}, nil, true) if @task.project.enable_periods? || @task.period_id%>
               <%=image_link_to_remote('ernes_stop.png', l(:abort), {:url => {:action => :abort_task, :id => @task}}, nil, true)%>
       <%# end -%>
             <% end -%>

data/app/views/tasks/list.rhtml

@@ -10,10 +10,10 @@ function handlePageEvent(event) {
 </script>
 
       <div class="btitle">
-        <h4><%=h @backlog.name %></h4>
+        <h4><%=h @project.name %></h4>
       </div>
 
-<!-- Insert backlog logo here
+<!-- Insert project logo here
 <img src="/images/blank.jpg" width="100" height="100" alt="Place An Alternate Description Here!" longdesc="image-description.txt" />
 <a href="image-description.txt" class="dlink" title="Place An Alternate Description Here!"></a>
 -->
@@ -27,7 +27,7 @@ function handlePageEvent(event) {
     <th><%=l :task %></th>
   </tr>
 <% i = 1 %>
-<% for task in @backlog.tasks %>
+<% for task in @project.tasks %>
   <% i += 1 %>
 <script type="text/javascript">
 function handle<%=task.id%>(event) {

data/app/views/tasks/list_started.rhtml

@@ -4,7 +4,7 @@
         <h4><%=l :started_tasks %> (<%= Date.today %>)</h4>
       </div>
 
-<!-- TODO: Insert backlog logo here
+<!-- TODO: Insert project logo here
 <img src="/images/blank.jpg" width="100" height="100" alt="Place An Alternate Description Here!" longdesc="image-description.txt" />
 <a href="image-description.txt" class="dlink" title="Place An Alternate Description Here!"></a>
 -->
@@ -36,13 +36,13 @@ function handleEvent(field, event, id) {
 </script>
 
 <% if @tasks %>
-<%=render :partial => '/tasks/fields_header', :locals => {:backlog => nil, :active => true, :track_todo => @tasks.find {|t|t.track_todo?}, :track_done => @tasks.find {|t|t.track_done?}, :track_times => @tasks.find {|t|t.period && t.period.active?}} %>
+<%=render :partial => '/tasks/fields_header', :locals => {:project => nil, :active => true, :track_todo => @tasks.find {|t|t.track_todo?}, :track_done => @tasks.find {|t|t.track_done?}, :track_times => @tasks.find {|t|t.period && t.period.active?}, :work_done => nil} %>
 <ul class="task_list">
 <% i = 0 %>
-<% current_backlog = nil %>
+<% current_project = nil %>
 <% current_period = nil %>
 <% for task in @tasks %>
-  <%=render :partial => 'task', :locals => { :task => task, :i => i, :active => true, :highlight_task => (task == @selected_task), :update => :spotlight, :show_backlog => true, :hidden => false } %>
+  <%=render :partial => 'task', :locals => { :task => task, :i => i, :active => true, :highlight_task => (task == @selected_task), :update => :spotlight, :show_project => true, :hidden => false } %>
   <% i += 1 %>
 <% end %>
 

data/app/views/tasks/start_work.rjs

@@ -1 +1 @@
-page.replace "task_#{@task.id}", :partial => '/tasks/task', :locals => { :task => @task, :i => 1, :active => true, :highlight_task => false, :update => :spotlight, :hidden => false, :show_backlog => false }
+page.replace "task_#{@task.id}", :partial => '/tasks/task', :locals => { :task => @task, :i => 1, :active => true, :highlight_task => false, :update => :spotlight, :hidden => false, :show_project => false }

data/app/views/user/login.rhtml

@@ -2,7 +2,7 @@
 
 <div title="<%= title_helper %>" class="form">
   <div class="form-padding">
-    <% form_for :user, :html => {:id => 'loginForm'} do |f| %>
+    <%=form_for :user, :html => {:id => 'loginForm'} do |f| %>
       <table>
         <tr class="two_columns">
           <td class="prompt"><label>Login:</label></td>

data/app/views/user/signup.rhtml

@@ -4,7 +4,7 @@
 
   <div class="form-padding">
     <%= start_form_tag_helper %>
-      <%= render :partial => 'edit', :locals => {:submit => false} %></br>
+      <%= render :partial => 'edit', :locals => {:submit => false} %><br/>
       <%= render :partial => 'password', :locals => {:submit => false} %>
       
       <div class="button-bar">

data/app/views/user/welcome.rhtml

@@ -2,7 +2,7 @@
   <%= head_helper 'Welcome', :notice => false, :message => false %>
   <p>You are now logged into the system...</p>
   <p>
-    Welcome to Backlog!
+    Welcome to Project!
   </p>
   <%=link_to l(:welcome_link), :controller => 'welcome' %>
 </div>

data/app/views/works/_description_list.rhtml

@@ -1,5 +1,5 @@
 <ul class="tasks">
 <% for task in @tasks do -%>
-  <li class="task"><div class="name"><%="#{h task.root_task.backlog.name}: " unless @backlog%><%=h task.description %></div><div class="email" align="right"><span class="informal"><%=h task.root_task.backlog.name %></span></div></li>
+  <li class="task"><div class="name"><%="#{h task.root_task.project.name}: " unless @project%><%=h task.description %></div><div class="email" align="right"><span class="informal"><%=h task.root_task.project.name %></span></div></li>
 <% end -%>
 </ul>

data/app/views/works/_form.rhtml

@@ -1,11 +1,11 @@
 <!--[form:work]-->
 
-<p><%=l :backlog%>:<br/>
-<%= select 'work', 'backlog_id', @backlogs.map{|wa| [wa.name, wa.id]}.sort %>
-<% if @work.backlog -%>
-  <%=image_detour_to('work_account.png', "#{l(:backlog)} #{@work.backlog.name}", {:controller => 'backlogs', :action => :edit, :id => @work.backlog}, {:class => 'image-submit', :style => 'vertical-align: bottom'}) %>
+<p><%=l :project%>:<br/>
+<%= select 'work', 'project_id', @projects.map{|wa| [wa.name, wa.id]}.sort %>
+<% if @work.project -%>
+  <%=image_detour_to('work_account.png', "#{l(:project)} #{@work.project.name}", {:controller => 'projects', :action => :edit, :id => @work.project}, {:class => 'image-submit', :style => 'vertical-align: bottom'}) %>
 <% end -%>
-<%=detour_to l(:new_backlog), :controller => 'backlogs', :action => :new %>
+<%=detour_to l(:new_project), :controller => 'projects', :action => :new %>
 </p>
 
 <p><%=l :task%>:<br/>

data/app/views/works/_new_row.rhtml

@@ -1,10 +1,9 @@
-<% form_tag with_detour(:controller => 'works', :action => 'create'), :id => "work_form" do %>
-<%=submit_tag('checkmark', :value => l(:save), :style => 'display: none')%>
+<%=form_for @work, :url => with_detour(:controller => 'works', :action => 'create'), :html => {:id => "work_form"} do |f| %>
 <%=hidden_field :work, :started_on, :value => @date %>
 
   <tr>
     <td id="account_cell" valign="bottom">
-      <%=select :work, :backlog_id, [['', '']] + @backlogs.map {|wa| [wa.name, wa.id]}, :value => '' %>
+      <%=f.select :project_id, [['', '']] + @projects.map{|wa| [wa.name, wa.id]}, :value => '' %>
     </td>
     <td valign="bottom">
       <%=text_field_with_auto_complete :work, :description, {:class => :task_description,
@@ -19,13 +18,13 @@
 	          e.focus();
 	          e.select();
 	        } else if(event.keyCode == 13) {
-	          e = $('work_backlog_id'); 
+	          e = $('work_project_id'); 
 			  if(e.value == '') {
 	          	e.focus();
 	          	e.select();
 			  	return false;
 			  }
-	        }"}, :with => "'description=' + $('work_description').value + '&backlog_id=' + $('work_backlog_id').value"
+	        }"}, :with => "'description=' + $('work_description').value + '&project_id=' + $('work_project_id').value"
 	  %>
 	  <br clear="all"/>
 			<% field = 'notes' %> 
@@ -72,7 +71,7 @@
           e.focus();
           e.select();
         } else if(event.keyCode == 13) {
-          e = $('work_backlog_id'); 
+          e = $('work_project_id'); 
 		  if(e.value == '') {
           	e.focus();
           	e.select();
@@ -99,7 +98,7 @@
           e.focus();
           e.select();
         } else if(event.keyCode == 13) {
-          e = $('work_backlog_id'); 
+          e = $('work_project_id'); 
 		  if(e.value == '') {
           	e.focus();
           	e.select();
@@ -117,7 +116,7 @@
           e.focus();
           e.select();
         } else if(event.keyCode == 13) {
-          e = $('work_backlog_id'); 
+          e = $('work_project_id'); 
 		  if(e.value == '') {
           	e.focus();
           	e.select();
@@ -136,6 +135,7 @@
       <%=text_field_with_auto_complete :work, :customer_name, {:value => '', :size => 16, :class => :task_description} %>
     </td>
 	<td id="work_icons_cell" valign="bottom">
+      <%=submit_tag('checkmark', :value => l(:save))%>
     </td>
   </tr>
 <% end %>

data/app/views/works/_row.rhtml

@@ -1,7 +1,7 @@
   <tr id="work_<%=@work.id%>" style="border: 1px solid black; vertical-align: top">
     <td>
 	  <% remote_form_for :work, :url => {:action => :update_row, :id => @work.id, :next_field => :description}, :html => {:id => "work_#{@work.id}_form"} do |f|%>
-        <%=f.select :backlog_id, @backlogs.map {|wa| [wa.name, wa.id]}, {}, :id => "work_#{@work.id}_backlog_id", :onchange => "new Ajax.Request('/works/update_row/#{@work.id}?next_field=customer_id', {asynchronous:true, evalScripts:true, parameters:Form.serialize(form)})"%>
+        <%=f.select :project_id, @projects.map {|wa| [wa.name, wa.id]}, {}, :id => "work_#{@work.id}_project_id", :onchange => "new Ajax.Request('/works/update_row/#{@work.id}?next_field=customer_id', {asynchronous:true, evalScripts:true, parameters:Form.serialize(form)})"%>
       <% end %>
     </td>
     <td>

data/app/views/works/_task_id_list.rhtml

@@ -1,5 +1,5 @@
 <ul class="tasks" style="width: 30em; background: white">
 <% for task in @tasks do -%>
-  <li><div style="width: 40em"><%=task.id%><span class="informal"> <%="#{h task.root_task.backlog.name}: " unless @backlog%><%=h task.description %></span></div></li>
+  <li><div style="width: 40em"><%=task.id%><span class="informal"> <%="#{h task.root_task.project.name}: " unless @project%><%=h task.description %></span></div></li>
 <% end -%>
 </ul>

data/app/views/works/daily_work_sheet.rhtml

@@ -97,7 +97,7 @@
 //<!--
 var start_field;
 <% if last_work.nil? || last_work.completed_at %>
-	start_field = $('work_backlog_id');
+	start_field = $('work_project_id');
 <% else %>
 	start_field = $('work_<%=last_work.id%>_completed_at_time');
 <% end %>

data/app/views/works/list.rhtml

@@ -9,10 +9,10 @@
 		<table>
 			<tr>
 				<td coslpan="3">
-					<label for="report_filter_backlog_id"><%=l :backlog%></label>
+					<label for="report_filter_project_id"><%=l :project%></label>
 				</td>
 				<td>
-					<%=f.select :backlog_id, [[l(:all), nil]] + @backlogs.map{|wa|[wa.name, wa.id]}, {}, {:onchange => 'form.submit()'} %>
+					<%=f.select :project_id, [[l(:all), nil]] + @projects.map{|wa|[wa.name, wa.id]}, {}, {:onchange => 'form.submit()'} %>
 				</td>
 			</tr>
 			<tr>
@@ -101,7 +101,7 @@
   <tr>
     <th><%=l :user %></th>
     <th><%=l :done %></th>
-    <th><%=l :backlog %></th>
+    <th><%=l :project %></th>
     <th><%=l :description %></th>
     <th><%=l :invoice %></th>
     <th><%=l :started_at %></th>
@@ -112,7 +112,7 @@
   <tr>
     <td valign="top"><%=work.user && work.user.login %></td>
     <td align="right" valign="top"><%='%.2f' % work.hours %></td>
-    <td valign="top"><%=work.backlog.name %></td>
+    <td valign="top"><%=work.project.name %></td>
 	<%if work.task 
 		link = "Task: #{work.task.description} <br/>"
 	else
@@ -138,7 +138,7 @@
 <% if @period %>
 	<%=back_or_link_to l(:back), :controller => 'periods', :action => :show, :id => @period %>
 <% else %>
-	<%=back_or_link_to l(:back), :controller => 'backlogs', :action => :show, :id => @backlog %>
+	<%=back_or_link_to l(:back), :controller => 'projects', :action => :show, :id => @project %>
 <% end %>
 
 </div>

data/app/views/works/list_excel.rhtml

@@ -59,7 +59,7 @@
    </Row>
 
    <Row ss:AutoFitHeight="0" ss:Height="19.875">
-    <Cell ss:StyleID="header"><Data ss:Type="String"><%=l :backlog%></Data></Cell>
+    <Cell ss:StyleID="header"><Data ss:Type="String"><%=l :project%></Data></Cell>
     <Cell ss:StyleID="header"><Data ss:Type="String"><%=l :user%></Data></Cell>
     <Cell ss:StyleID="header"><Data ss:Type="String"><%=l :task%></Data></Cell>
     <Cell ss:StyleID="header"><Data ss:Type="String"><%=l :description%></Data></Cell>
@@ -71,7 +71,7 @@
    
 <% for work in @works %>
    <Row>
-    <Cell><Data ss:Type="String"><%=work.backlog.name %></Data></Cell>
+    <Cell><Data ss:Type="String"><%=work.project.name %></Data></Cell>
     <Cell><Data ss:Type="String"><%=work.user && work.user.name %></Data></Cell>
     <Cell><Data ss:Type="String"><%=work.task && work.task.description %></Data></Cell>
     <Cell><Data ss:Type="String"><%=work.description %></Data></Cell>

data/app/views/works/timeliste.rhtml

@@ -450,12 +450,12 @@
     <Cell ss:StyleID="s37"><Data ss:Type="String">Merknad</Data></Cell>
    </Row>
    
-<% for backlog_id in @work_totals_per_backlog.keys %>
-  <% invoice_works_per_day = @work_totals_per_backlog[backlog_id][0]%>
+<% for project_id in @work_totals_per_project.keys %>
+  <% invoice_works_per_day = @work_totals_per_project[project_id][0]%>
   <% if invoice_works_per_day.find{|total| total > 0} %>
    <Row>
-    <Cell ss:StyleID="s24"><Data ss:Type="String"><%=Backlog.find(backlog_id).invoice_code %></Data></Cell>
-    <Cell ss:StyleID="s25"><Data ss:Type="String"><%=Backlog.find(backlog_id).name %></Data></Cell>
+    <Cell ss:StyleID="s24"><Data ss:Type="String"><%=Project.find(project_id).invoice_code %></Data></Cell>
+    <Cell ss:StyleID="s25"><Data ss:Type="String"><%=Project.find(project_id).name %></Data></Cell>
     <Cell ss:StyleID="s25"><Data ss:Type="String">  X</Data></Cell>
     <Cell ss:StyleID="s25"/>
     <Cell ss:StyleID="s25"/>
@@ -469,11 +469,11 @@
    </Row>
   <% end %>
 
-  <% internal_works_per_day = @work_totals_per_backlog[backlog_id][1]%>
+  <% internal_works_per_day = @work_totals_per_project[project_id][1]%>
   <% if internal_works_per_day.find{|total| total > 0} %>
    <Row>
-    <Cell ss:StyleID="s24"><Data ss:Type="String"><%=Backlog.find(backlog_id).invoice_code%></Data></Cell>
-    <Cell ss:StyleID="s25"><Data ss:Type="String"><%=Backlog.find(backlog_id).name %></Data></Cell>
+    <Cell ss:StyleID="s24"><Data ss:Type="String"><%=Project.find(project_id).invoice_code%></Data></Cell>
+    <Cell ss:StyleID="s25"><Data ss:Type="String"><%=Project.find(project_id).name %></Data></Cell>
     <Cell ss:StyleID="s25"/>
     <Cell ss:StyleID="s25"/>
     <Cell ss:StyleID="s25"/>
@@ -528,25 +528,25 @@
     <Cell ss:StyleID="s46"/>
     <Cell ss:StyleID="s46"/>
     <Cell ss:StyleID="s46"
-     ss:Formula="=IF(SUM(R[-<%=@work_totals_per_backlog.size*2+2%>]C:R[-1]C),SUM(R[-<%=@work_totals_per_backlog.size*2+2%>]C:R[-1]C),&quot;&quot;)"><Data
+     ss:Formula="=IF(SUM(R[-<%=@work_totals_per_project.size*2+2%>]C:R[-1]C),SUM(R[-<%=@work_totals_per_project.size*2+2%>]C:R[-1]C),&quot;&quot;)"><Data
       ss:Type="String"></Data></Cell>
     <Cell ss:StyleID="s46"
-     ss:Formula="=IF(SUM(R[-<%=@work_totals_per_backlog.size*2+2%>]C:R[-1]C),SUM(R[-<%=@work_totals_per_backlog.size*2+2%>]C:R[-1]C),&quot;&quot;)"><Data
+     ss:Formula="=IF(SUM(R[-<%=@work_totals_per_project.size*2+2%>]C:R[-1]C),SUM(R[-<%=@work_totals_per_project.size*2+2%>]C:R[-1]C),&quot;&quot;)"><Data
       ss:Type="String"></Data></Cell>
     <Cell ss:StyleID="s46"
-     ss:Formula="=IF(SUM(R[-<%=@work_totals_per_backlog.size*2+2%>]C:R[-1]C),SUM(R[-<%=@work_totals_per_backlog.size*2+2%>]C:R[-1]C),&quot;&quot;)"><Data
+     ss:Formula="=IF(SUM(R[-<%=@work_totals_per_project.size*2+2%>]C:R[-1]C),SUM(R[-<%=@work_totals_per_project.size*2+2%>]C:R[-1]C),&quot;&quot;)"><Data
       ss:Type="String"></Data></Cell>
     <Cell ss:StyleID="s46"
-     ss:Formula="=IF(SUM(R[-<%=@work_totals_per_backlog.size*2+2%>]C:R[-1]C),SUM(R[-<%=@work_totals_per_backlog.size*2+2%>]C:R[-1]C),&quot;&quot;)"><Data
+     ss:Formula="=IF(SUM(R[-<%=@work_totals_per_project.size*2+2%>]C:R[-1]C),SUM(R[-<%=@work_totals_per_project.size*2+2%>]C:R[-1]C),&quot;&quot;)"><Data
       ss:Type="String"></Data></Cell>
     <Cell ss:StyleID="s46"
-     ss:Formula="=IF(SUM(R[-<%=@work_totals_per_backlog.size*2+2%>]C:R[-1]C),SUM(R[-<%=@work_totals_per_backlog.size*2+2%>]C:R[-1]C),&quot;&quot;)"><Data
+     ss:Formula="=IF(SUM(R[-<%=@work_totals_per_project.size*2+2%>]C:R[-1]C),SUM(R[-<%=@work_totals_per_project.size*2+2%>]C:R[-1]C),&quot;&quot;)"><Data
       ss:Type="String"></Data></Cell>
     <Cell ss:StyleID="s46"
-     ss:Formula="=IF(SUM(R[-<%=@work_totals_per_backlog.size*2+2%>]C:R[-1]C),SUM(R[-<%=@work_totals_per_backlog.size*2+2%>]C:R[-1]C),&quot;&quot;)"><Data
+     ss:Formula="=IF(SUM(R[-<%=@work_totals_per_project.size*2+2%>]C:R[-1]C),SUM(R[-<%=@work_totals_per_project.size*2+2%>]C:R[-1]C),&quot;&quot;)"><Data
       ss:Type="String"></Data></Cell>
     <Cell ss:StyleID="s46"
-     ss:Formula="=IF(SUM(R[-<%=@work_totals_per_backlog.size*2+2%>]C:R[-1]C),SUM(R[-<%=@work_totals_per_backlog.size*2+2%>]C:R[-1]C),&quot;&quot;)"><Data
+     ss:Formula="=IF(SUM(R[-<%=@work_totals_per_project.size*2+2%>]C:R[-1]C),SUM(R[-<%=@work_totals_per_project.size*2+2%>]C:R[-1]C),&quot;&quot;)"><Data
       ss:Type="String"></Data></Cell>
     <Cell ss:StyleID="s47"/>
    </Row>