backlog 0.35.5 → 0.36.2

data/app/views/tasks/edit.rhtml

@@ -35,7 +35,7 @@
                   :class => :task_time, :maxlength => 5 %>
             <% end %>
           <% elsif @task.track_times? && (@task.period.nil? || @task.period.active?) %>
-            <%=image_link_to_remote 'hammer.png', l(:start_work), {:controller => 'tasks', :action => :start_work, :id => @task.id}, nil, true %>
+            <%=image_link_to_remote 'hammer.png', l(:start_work), {:url => {:controller => 'tasks', :action => :start_work, :id => @task.id}}, nil, true %>
           <% end -%>
       <% end -%>
     </div>
@@ -51,14 +51,14 @@
           <% 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), {:action => :move_task_to_next_period, :id => @task}, nil, true) if @task.backlog.enable_periods? || @task.period_id%>
-              <%=image_link_to_remote('ernes_stop.png', l(:abort), {:action => :abort_task, :id => @task}, nil, true)%>
+              <%=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('ernes_stop.png', l(:abort), {:url => {:action => :abort_task, :id => @task}}, nil, true)%>
       <%# end -%>
             <% end -%>
           <% end -%>
         <% elsif (@task.period.nil? || (not @task.period.passed?)) && @task.leaf? -%>
       <% form_tag({:controller => 'tasks', :action => 'update', :id => @task}) do -%>
-          <%=image_link_to_remote('eraser.png', l(:reopen), {:action => :reopen_task, :id => @task}, nil, true) %>
+          <%=image_link_to_remote('eraser.png', l(:reopen), {:url => {:action => :reopen_task, :id => @task}}, nil, true) %>
       <% end -%>
         <% end -%>
     </div>

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 }
+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 }

data/app/views/user/_edit.rhtml

@@ -22,7 +22,7 @@
     <% if submit %>
      <tr>
        <td colspan="2">
-         <%= submit_tag user.new_record? ? 'signup' : l(:save), :class => 'two_columns' %>
+         <%= submit_tag @user.new_record? ? 'signup' : l(:save), :class => 'two_columns' %>
          <%= back_or_link_to l(:back), :action => 'list' %>
        </td>
      </tr>

data/app/views/user/change_password.rhtml

@@ -9,7 +9,7 @@
     Enter your new password in the fields below and click 'Change Password' to have a new password sent to your email inbox.
 
     <%= start_form_tag_helper %>
-      <%= render_partial 'password', :user => @user, :submit => false %>
+      <%=render :partial => 'password', :locals => {:submit => false} %>
       <div class="button-bar">
         <%= submit_tag 'Change Password' %>
         <%= link_to 'Cancel', :action => 'welcome' %>

data/app/views/user/edit.rhtml

@@ -10,7 +10,7 @@
   </div>
 
     <%= start_form_tag_helper %>
-      <%= render_partial 'edit', :user => @user, :submit => true %>
+      <%=render :partial => 'edit', :locals => {:submit => true} %>
     </form>
 </div>
 
@@ -62,7 +62,7 @@
 				<% for subscriber in @user.work_lock_subscribers %>
 					<tr>
 						<td align="right"><%=detour_to subscriber.name, :action => :edit%></td>
-						<td align="left"><%=image_link_to_remote 'email.png', "#{l :stop} #{l :monitoring}", {:action => :toggle_work_lock_monitoring, :id => current_user.id, :subscriber_id => subscriber.id}, :id => "work_lock_monitor_icon_#{subscriber.id}"%></td>
+						<td align="left"><%=image_link_to_remote 'email.png', "#{l :stop} #{l :monitoring}", {:url => {:action => :toggle_work_lock_monitoring, :id => current_user.id, :subscriber_id => subscriber.id}}, :id => "work_lock_monitor_icon_#{subscriber.id}"%></td>
 					</tr>
 				<% end %>
 			<% end %>
@@ -78,7 +78,7 @@
 		</table>
 	<% else %>
 		<% monitoring = @user.work_lock_subscribers.include? current_user %>
-		<%=image_link_to_remote "email#{'_grey' unless monitoring}.png", "#{l(monitoring ? :stop : :start)} #{l(:monitoring)}", {:action => :toggle_work_lock_monitoring, :id => @user.id}, {:id => "work_lock_monitor_icon_#{current_user.id}", :style => 'float: right'} %>
+		<%=image_link_to_remote "email#{'_grey' unless monitoring}.png", "#{l(monitoring ? :stop : :start)} #{l(:monitoring)}", {:url => {:action => :toggle_work_lock_monitoring, :id => @user.id}}, {:id => "work_lock_monitor_icon_#{current_user.id}", :style => 'float: right'} %>
 	<% end %>
 </div>
 
@@ -95,7 +95,7 @@
 					<tr>
 						<td align="right"><%=detour_to subscribee.name, :action => :edit, :id => subscribee.id %></td>
 						<td align="left"><%=image_link_to 'work_account.png', "#{l :work}", {:controller => 'works', :action => :weekly_work_sheet, :user_id => subscribee.id} %></td>
-						<td align="left"><%=image_link_to_remote 'email.png', "#{l :stop} #{l :monitoring}", {:action => :toggle_work_lock_monitoring, :subscriber_id => current_user.id, :id => subscribee.id}, :id => "work_lock_monitor_icon_#{subscribee.id}"%></td>
+						<td align="left"><%=image_link_to_remote 'email.png', "#{l :stop} #{l :monitoring}", {:url => {:action => :toggle_work_lock_monitoring, :subscriber_id => current_user.id, :id => subscribee.id}}, :id => "work_lock_monitor_icon_#{subscribee.id}"%></td>
 					</tr>
 				<% end %>
 			<% end %>

data/app/views/user/signup.rhtml

@@ -4,8 +4,8 @@
 
   <div class="form-padding">
     <%= start_form_tag_helper %>
-      <%= render_partial 'edit', :user => @user, :submit => false %></br>
-      <%= render_partial 'password', :submit => false %>
+      <%= render :partial => 'edit', :locals => {:submit => false} %></br>
+      <%= render :partial => 'password', :locals => {:submit => false} %>
       
       <div class="button-bar">
         <%= submit_tag l(:signup) %>

data/app/views/works/_form.rhtml

@@ -1,11 +1,11 @@
 <!--[form:work]-->
 
-<p><%=l :work_account%>:<br/>
-<%= select 'work', 'work_account_id', @work_accounts.map{|wa| [wa.name, wa.id]}.sort %>
-<% if @work.work_account -%>
-  <%=image_detour_to('work_account.png', "#{l(:work_account)} #{@work.work_account.name}", {:controller => 'work_accounts', :action => :edit, :id => @work.work_account}, {:class => 'image-submit', :style => 'vertical-align: bottom'}) %>
+<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'}) %>
 <% end -%>
-<%=detour_to l(:new_work_account), :controller => 'work_accounts', :action => :new %>
+<%=detour_to l(:new_backlog), :controller => 'backlogs', :action => :new %>
 </p>
 
 <p><%=l :task%>:<br/>
@@ -71,7 +71,7 @@
 <p style="float: left;"><label for="work_hours"><%=l :hours%></label><br/>
 <%=text_field 'work', 'hours_time', :class => :task_hours, :value => t(@work.hours)  %></p>
 
-<p style="float: left;"><br/><%=image_link_to_remote 'refresh.png', l(:refresh), :action => :calculate_hours, :started_at => "' + $('work_started_at').value + '", :completed_at => "' + $('work_completed_at').value + '" %></p>
+<p style="float: left;"><br/><%=image_link_to_remote 'refresh.png', l(:refresh), {:url => {:action => :calculate_hours}, :with => "'started_at=' + $('work_started_at').value + '&completed_at=' + $('work_completed_at').value"} %></p>
 
 <% end %>
 

data/app/views/works/_new_row.rhtml

@@ -4,7 +4,7 @@
 
   <tr>
     <td id="account_cell" valign="bottom">
-      <%=select :work, :work_account_id, [['', '']] + @work_accounts.map {|wa| [wa.name, wa.id]}, :value => '' %>
+      <%=select :work, :backlog_id, [['', '']] + @backlogs.map {|wa| [wa.name, wa.id]}, :value => '' %>
     </td>
     <td valign="bottom">
       <%=text_field_with_auto_complete :work, :description, {:class => :task_description,
@@ -19,13 +19,13 @@
 	          e.focus();
 	          e.select();
 	        } else if(event.keyCode == 13) {
-	          e = $('work_work_account_id'); 
+	          e = $('work_backlog_id'); 
 			  if(e.value == '') {
 	          	e.focus();
 	          	e.select();
 			  	return false;
 			  }
-	        }"}, :with => "'description=' + $('work_description').value + '&work_account_id=' + $('work_work_account_id').value"
+	        }"}, :with => "'description=' + $('work_description').value + '&backlog_id=' + $('work_backlog_id').value"
 	  %>
 	  <br clear="all"/>
 			<% field = 'notes' %> 
@@ -72,7 +72,7 @@
           e.focus();
           e.select();
         } else if(event.keyCode == 13) {
-          e = $('work_work_account_id'); 
+          e = $('work_backlog_id'); 
 		  if(e.value == '') {
           	e.focus();
           	e.select();
@@ -99,7 +99,7 @@
           e.focus();
           e.select();
         } else if(event.keyCode == 13) {
-          e = $('work_work_account_id'); 
+          e = $('work_backlog_id'); 
 		  if(e.value == '') {
           	e.focus();
           	e.select();
@@ -117,7 +117,7 @@
           e.focus();
           e.select();
         } else if(event.keyCode == 13) {
-          e = $('work_work_account_id'); 
+          e = $('work_backlog_id'); 
 		  if(e.value == '') {
           	e.focus();
           	e.select();

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 :work_account_id, @work_accounts.map {|wa| [wa.name, wa.id]}, {}, :id => "work_#{@work.id}_work_account_id", :onchange => "new Ajax.Request('/works/update_row/#{@work.id}?next_field=customer_id', {asynchronous:true, evalScripts:true, parameters:Form.serialize(form)})"%>
+        <%=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)})"%>
       <% end %>
     </td>
     <td>
@@ -81,7 +81,7 @@
             :onchange => "new Ajax.Request('/works/update_row/#{@work.id}?next_field=task_id', {asynchronous:true, evalScripts:true, parameters:Form.serialize(form)})"%>
       <% end %>
     </td>
-	<td align="right">
+	<td align="right" style="width: 6em" nowrap="true">
       <% remote_form_for :work, :url => {:action => :update_row, :id => @work.id, :next_field => :invoice} do |f|%>
       	<%=text_field_with_auto_complete "work_#{@work.id}", :task_id, 
 				{:name => "work[task_id]", :value => @work.task_id, :class => :task_id, :onchange => "new Ajax.Request('/works/update_row/#{@work.id}?next_field=invoice', {asynchronous:true, evalScripts:true, parameters:Form.serialize(form)})"}, 

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_work_account_id');
+	start_field = $('work_backlog_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_work_account_id"><%=l :work_account%></label>
+					<label for="report_filter_backlog_id"><%=l :backlog%></label>
 				</td>
 				<td>
-					<%=f.select :work_account_id, [[l(:all), nil]] + @work_accounts.map{|wa|[wa.name, wa.id]}, {}, {:onchange => 'form.submit()'} %>
+					<%=f.select :backlog_id, [[l(:all), nil]] + @backlogs.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 :work_account %></th>
+    <th><%=l :backlog %></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.work_account.name %></td>
+    <td valign="top"><%=work.backlog.name %></td>
 	<%if work.task 
 		link = "Task: #{work.task.description} <br/>"
 	else
@@ -121,7 +121,7 @@
 	link += h(work.description)
 	%>
     <td valign="top"><%=detour_to link, :controller => 'works', :action => 'daily_work_sheet', :id => work.started_on.strftime("%Y-%m-%d"), :user_id => work.user_id %></td>
-    <td><%=work.invoice ? l(:yes) : '' %></td>
+    <td><%=work.invoice ? t(:yes) : '' %></td>
     <td valign="top"><%=(work.started_at && work.started_at.strftime('%Y-%m-%d %H:%M:%S')) || work.started_on.strftime('%Y-%m-%d') %></td>
     <td valign="top"><%=(work.completed_at && work.completed_at.strftime('%Y-%m-%d %H:%M:%S')) || work.started_on.strftime('%Y-%m-%d') %></td>
     <tr>
@@ -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 => 'work_accounts', :action => :show, :id => @work_account %>
+	<%=back_or_link_to l(:back), :controller => 'backlogs', :action => :show, :id => @backlog %>
 <% end %>
 
 </div>

data/app/views/works/list_excel.rhtml

@@ -36,6 +36,9 @@
   <Style ss:ID="header">
    <Font x:Family="Swiss" ss:Size="14" ss:Bold="1"/>
   </Style>
+   <Style ss:ID="LongDateFormat">
+   <NumberFormat ss:Format="dd/mm/yy\ h:mm;@"/>
+  </Style>
  </Styles>
  <Worksheet ss:Name="<%=l(:done)%>">
   <Table ss:ExpandedColumnCount="256" x:FullColumns="1"
@@ -56,7 +59,7 @@
    </Row>
 
    <Row ss:AutoFitHeight="0" ss:Height="19.875">
-    <Cell ss:StyleID="header"><Data ss:Type="String"><%=l :work_account%></Data></Cell>
+    <Cell ss:StyleID="header"><Data ss:Type="String"><%=l :backlog%></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>
@@ -68,16 +71,17 @@
    
 <% for work in @works %>
    <Row>
-    <Cell><Data ss:Type="String"><%=work.work_account.name %></Data></Cell>
+    <Cell><Data ss:Type="String"><%=work.backlog.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>
     <Cell><Data ss:Type="Number"><%=work.hours %></Data></Cell>
     <Cell><Data ss:Type="String"><%=work.invoice? ? 'Ja' : 'Nei' %></Data></Cell>
-    <Cell><Data ss:Type="DateTime"><%=work.start_time ? work.started_on.at(work.start_time).strftime('%Y-%m-%dT%H:%M:%S') : work.started_on.strftime('%Y-%m-%d') %></Data></Cell>
+     <Cell ss:StyleID="LongDateFormat"><Data ss:Type="DateTime"><%=work.start_time ? work.started_on.at(work.start_time).strftime('%Y-%m-%dT%H:%M:%S') : work.started_on.strftime('%Y-%m-%d') %></Data></Cell>
   <% if work.completed_at %>
-    <Cell><Data ss:Type="DateTime"><%=work.completed_at.strftime('%Y-%m-%dT%H:%M:%S') %></Data></Cell>
+    <Cell ss:StyleID="LongDateFormat"><Data ss:Type="DateTime"><%=work.completed_at.strftime('%Y-%m-%dT%H:%M:%S') %></Data></Cell>
   <% end %>
+
    </Row>
 
   <% end %>

data/app/views/works/timeliste.rhtml

@@ -450,12 +450,12 @@
     <Cell ss:StyleID="s37"><Data ss:Type="String">Merknad</Data></Cell>
    </Row>
    
-<% for work_account_id in @work_totals_per_work_account.keys %>
-  <% invoice_works_per_day = @work_totals_per_work_account[work_account_id][0]%>
+<% for backlog_id in @work_totals_per_backlog.keys %>
+  <% invoice_works_per_day = @work_totals_per_backlog[backlog_id][0]%>
   <% if invoice_works_per_day.find{|total| total > 0} %>
    <Row>
-    <Cell ss:StyleID="s24"><Data ss:Type="String"><%=WorkAccount.find(work_account_id).invoice_code %></Data></Cell>
-    <Cell ss:StyleID="s25"><Data ss:Type="String"><%=WorkAccount.find(work_account_id).name %></Data></Cell>
+    <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="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_work_account[work_account_id][1]%>
+  <% internal_works_per_day = @work_totals_per_backlog[backlog_id][1]%>
   <% if internal_works_per_day.find{|total| total > 0} %>
    <Row>
-    <Cell ss:StyleID="s24"><Data ss:Type="String"><%=WorkAccount.find(work_account_id).invoice_code%></Data></Cell>
-    <Cell ss:StyleID="s25"><Data ss:Type="String"><%=WorkAccount.find(work_account_id).name %></Data></Cell>
+    <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="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_work_account.size*2+2%>]C:R[-1]C),SUM(R[-<%=@work_totals_per_work_account.size*2+2%>]C:R[-1]C),&quot;&quot;)"><Data
+     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:Type="String"></Data></Cell>
     <Cell ss:StyleID="s46"
-     ss:Formula="=IF(SUM(R[-<%=@work_totals_per_work_account.size*2+2%>]C:R[-1]C),SUM(R[-<%=@work_totals_per_work_account.size*2+2%>]C:R[-1]C),&quot;&quot;)"><Data
+     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:Type="String"></Data></Cell>
     <Cell ss:StyleID="s46"
-     ss:Formula="=IF(SUM(R[-<%=@work_totals_per_work_account.size*2+2%>]C:R[-1]C),SUM(R[-<%=@work_totals_per_work_account.size*2+2%>]C:R[-1]C),&quot;&quot;)"><Data
+     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:Type="String"></Data></Cell>
     <Cell ss:StyleID="s46"
-     ss:Formula="=IF(SUM(R[-<%=@work_totals_per_work_account.size*2+2%>]C:R[-1]C),SUM(R[-<%=@work_totals_per_work_account.size*2+2%>]C:R[-1]C),&quot;&quot;)"><Data
+     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:Type="String"></Data></Cell>
     <Cell ss:StyleID="s46"
-     ss:Formula="=IF(SUM(R[-<%=@work_totals_per_work_account.size*2+2%>]C:R[-1]C),SUM(R[-<%=@work_totals_per_work_account.size*2+2%>]C:R[-1]C),&quot;&quot;)"><Data
+     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:Type="String"></Data></Cell>
     <Cell ss:StyleID="s46"
-     ss:Formula="=IF(SUM(R[-<%=@work_totals_per_work_account.size*2+2%>]C:R[-1]C),SUM(R[-<%=@work_totals_per_work_account.size*2+2%>]C:R[-1]C),&quot;&quot;)"><Data
+     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:Type="String"></Data></Cell>
     <Cell ss:StyleID="s46"
-     ss:Formula="=IF(SUM(R[-<%=@work_totals_per_work_account.size*2+2%>]C:R[-1]C),SUM(R[-<%=@work_totals_per_work_account.size*2+2%>]C:R[-1]C),&quot;&quot;)"><Data
+     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:Type="String"></Data></Cell>
     <Cell ss:StyleID="s47"/>
    </Row>

data/app/views/works/update_row.rjs

@@ -1,7 +1,7 @@
 display_notice(page)
 if @work && @work.errors.empty?
   page.replace "work_#{@work.id}_task_description", ''
-  page.replace "work_#{@work.id}", :partial => 'row', :object => @work
+  page.replace "work_#{@work.id}", :partial => 'row', :object => @work, :locals => {:next_row_id => nil}
   page["work_#{@work.id}_#{@next_field}"].select
   page["work_#{@work.id}_#{@next_field}"].focus
 else

data/app/views/works/weekly_work_sheet.rhtml

@@ -7,7 +7,7 @@
 
 <table border="1">
   <tr>
-    <th><%=l :work_account %></th>
+    <th><%=l :backlog %></th>
   	<% [:monday, :tuesday, :wednesday, :thursday, :friday, :saturday, :sunday].each_with_index do |day, i| %>
     	<th align="center"><%=detour_to "#{l(day)} #{week_date(i+1)}", :action => :daily_work_sheet, :id => (@first_date + i).strftime('%Y-%m-%d'), :user_id => (@user != current_user ? @user : nil) %></th>
 	<% end %>
@@ -30,21 +30,21 @@
 
 <% week_totals = Hash.new(0) %>
 <% day_totals = Array.new(7, 0) %>
-<% for work_account, totals in @work_accounts %>
+<% for backlog, totals in @backlogs %>
   <tr>
     <td valign="top">
-      <%=detour_to(h(work_account.name), :controller => 'work_accounts', :action => :show, :id => work_account.id) %>
+      <%=detour_to(h(backlog.name), :controller => 'backlogs', :action => :show, :id => backlog.id) %>
     </td>
     <% totals.each_with_index do |total, day| %>
       <% if total %>
         <% day_totals[day] += total %>
-        <% week_totals[work_account] += total %>
+        <% week_totals[backlog] += total %>
         <td align="right" valign="top"><%=t(total)%></td>
       <% else %>
         <td/>
       <% end %>
     <% end %>
-    <td align="right"><%=t(week_totals[work_account])%></td>
+    <td align="right"><%=t(week_totals[backlog])%></td>
   </tr>
 <% end %>
   <tr>

data/app/views/works/weekly_work_sheet_details.rhtml

@@ -1,8 +1,8 @@
 <% @page_title = l(:weekly_work_sheet) + (@period ? " for #{@period}" : '') + (user? ? " for #{user.login}" : '')%>
 
 <div id="spotlight">
-<% track_times = @rows.find {|r| r.find {|w| w && w.work_account.track_times?}} %>
-<% invoicing = @rows.find {|r| r.find {|w| w && w.work_account.enable_invoicing?}} %>
+<% track_times = @rows.find {|r| r.find {|w| w && w.backlog.track_times?}} %>
+<% invoicing = @rows.find {|r| r.find {|w| w && w.backlog.enable_invoicing?}} %>
 <% columns = 2 + (track_times ? 1 : 0) + (invoicing ? 1 : 0) %>
 
 <h1>Work for week <%=@week%><%=user? ? " for #{user.login}" : ''%></h1>
@@ -18,7 +18,7 @@
   </tr>
   <tr>
 <% (1..7).each do %>
-    <th><%=l :work_account %></th>
+    <th><%=l :backlog %></th>
     <% if invoicing %>
     <th><%=l :invoice_short %></th>
     <% end %>
@@ -51,13 +51,13 @@
 <!--
           <%=detour_to(h(@work.task.period.name), :controller => 'periods', :action => :show, :id => @work.task.period) if @work.task && @work.task.period %>
 -->
-          <%=detour_to(h(@work.work_account.name), :controller => 'work_accounts', :action => :show, :id => @work.work_account_id) %>
+          <%=detour_to(h(@work.backlog.name), :controller => 'backlogs', :action => :show, :id => @work.backlog_id) %>
         </td>
         <% if invoicing %>
           <td id="invoice_<%=@work.id%>" valign="top">
 		  	<% form_id  = "work_#{@work.id}_invoice_form" %>
 		  	<% field_id = "work_#{@work.id}_invoice" %>
-            <%=check_box(:work, :invoice, :id => field_id, :name => field_id, :onchange => "new Ajax.Updater('invoice_#{@work}', '#{url_for(:action => :set_work_invoice, :id => @work)}' + '?value=' + this.checked);", :disabled => @lock) if @work.work_account.enable_invoicing? %>
+            <%=check_box(:work, :invoice, :id => field_id, :name => field_id, :onchange => "new Ajax.Updater('invoice_#{@work}', '#{url_for(:action => :set_work_invoice, :id => @work)}' + '?value=' + this.checked);", :disabled => @lock) if @work.backlog.enable_invoicing? %>
           </td>
         <% end %>
         <% if track_times %>