Moved financial_transaction into the new finance-namespace.

app/views/finance/transactions/_ordergroups.html.haml

@@ -19,10 +19,10 @@
   %tbody
     - for group in @groups
       %tr{:class => cycle('even','odd', :name => 'groups')}
-        %td= @current_user.role_admin? ? link_to(group.name, {:controller => 'admin', :action => 'showGroup', :id => group}, {:title => _("Show ordergroup")}) : group.name
+        %td= group.name
         %td= group.actual_size
         %td{:class => "currency", :style => "width:5em"}= number_to_currency(group.account_balance)
         %td{:class => "actions"}
-          = link_to image_tag("euro_new.png", :size => "16x16", :alt => _("New transaction"), :border => "0"), {:action => 'newTransaction', :id => group}, {:title => _("New transaction")}
-          = link_to image_tag("b_browse.png", :size => "16x16", :border => "0", :alt => 'Kontoauszug'), {:action => 'listTransactions', :id => group}, {:title => _("List transactions")}
+          = link_to image_tag("euro_new.png", :size => "16x16", :alt => _("New transaction"), :border => "0"), {:action => 'new', :id => group}, {:title => _("New transaction")}
+          = link_to image_tag("b_browse.png", :size => "16x16", :border => "0", :alt => 'Kontoauszug'), {:action => 'list', :id => group}, {:title => _("List transactions")}
         

app/views/finance/transactions/create.html.erb

@@ -0,0 +1,2 @@
+<h1>Finance::Transactions#create</h1>
+<p>Find me in app/views/finance/transactions/create.html.erb</p>

app/views/finance/transactions/create_collection.html.erb

@@ -0,0 +1,2 @@
+<h1>Finance::Transactions#create_collection</h1>
+<p>Find me in app/views/finance/transactions/create_collection.html.erb</p>

app/views/finance/transactions/index.html.haml

@@ -1,8 +1,9 @@
-- title _("Manage accounts")
+%h1 Manage accounts
 %p
   %i
     =_ "To create multiple transactions at once please follow this "
-    = link_to _("link"), :action => 'new_transactions'
+    = link_to _("link"), :action => 'new_collection'
+
 .left_column{:style=>"width:50em"}
   .box_title
     %h2=_ "Ordergroups"
@@ -15,10 +16,10 @@
       = observe_field 'query',  :frequency => 2, |
         :before => "Element.show('loader')", |
         :success => "Element.hide('loader')", |
-        :url => {:action => 'listOrdergroups'}, |
+        :url => {:action => 'index'}, |
         :with => 'query' |
     #table
-      = render :partial => "listOrdergroups"
+      = render :partial => "ordergroups"
     %br/
     - if @current_user.role_admin?
       = link_to _("New ordergroup"), :controller => 'admin', :action => 'newOrderGroup'

app/views/finance/transactions/list.html.erb

@@ -1,4 +1,5 @@
-<h1>Kontoauszug für <%= @group.name %></h1>
+<% title "Kontoauszug für #{@group.name}" %>
+
 <p>
   <b>Kontostand: <%= number_to_currency(@group.account_balance) -%></b>
   <span style="color:grey">(zuletzt aktualisiert vor <%= distance_of_time_in_words(Time.now, @group.account_updated) -%>)</span>
@@ -13,12 +14,12 @@
    <%= observe_field 'query',  :frequency => 2,
          :before => "Element.show('loader')",
          :success => "Element.hide('loader')",
-         :url => {:action => 'listTransactions'},
+         :url => {:action => 'list'},
          :with => 'query' %>
     <div id="table">          
-    <%= render :partial => "/financial_transactions/list" %>
+    <%= render :partial => "list" %>
     </div>
-    <p><%= link_to 'Neue Transaktion', :action => 'newTransaction', :id => @group %></p>
+    <p><%= link_to 'Neue Transaktion', :action => 'new', :id => @group %></p>
   </div>
+  <%= link_to 'Gruppenübersicht', :action => 'index' %>
 </div>
-    <%= link_to 'Bestellgruppen', :controller => 'finance', :action => "listOrdergroups" %>

app/views/finance/transactions/new.html.haml

@@ -0,0 +1,21 @@
+%h1 New transaction
+
+.edit_form{ :style => "width:30em" }
+  - form_for(@financial_transaction, :url => { :action => 'create' }) do |f|
+    = f.error_messages
+    = f.hidden_field :order_group_id
+    %p
+      Group:
+      %b=h @group.name
+    %p
+      = f.label :amount
+      %br/
+      = f.text_field :amount, :size => 10
+    %p
+      = f.label :note
+      %br/
+      = f.text_area :note, :cols => 40, :rows => 5
+    %p
+      = submit_tag "Save"
+
+= link_to "Back", :controller => 'transactions'

app/views/finance/transactions/new_collection.html.erb

@@ -0,0 +1,2 @@
+<h1>Finance::Transactions#new_collection</h1>
+<p>Find me in app/views/finance/transactions/new_collection.html.erb</p>

app/views/finance/transactions/new_collection.html.haml

@@ -1,6 +1,6 @@
 - title _("Update multiple accounts")
 
-- form_tag :action => "create_transactions" do
+- form_tag :action => "create_collection" do
   %p
     %b= _("Note") + ":"
     = text_field_tag "note"
@@ -17,4 +17,4 @@
   %p
     = submit_tag _("Save")
     |
-    = link_to _("Cancel"), :action => 'listOrdergroups'
+    = link_to _("Cancel"), :controller => 'finance/transactions'

app/views/financial_transactions/_form.rhtml

@@ -1,10 +0,0 @@
-<%= error_messages_for 'financial_transaction' %>
-
-<div class="edit_form" style="width:30em">
-<p><b><%=h @group.name %></b>
-<p><label for="financial_transaction_amount">Betrag</label>
-<%= text_field 'financial_transaction', 'amount', :size => '10'  %> Euro</p>
-
-<p><label for="financial_transaction_note">Note</label><br/>
-<%= text_area 'financial_transaction', 'note', :cols => "40", :rows => "5" %></p>
-</div>

app/views/financial_transactions/new.rhtml

@@ -1,9 +0,0 @@
-<h1>Neue Transaktion</h1>
-
-<% form_tag(:action => 'createTransaction', :id => @group) do -%>
-  <%= render :partial => 'financial_transactions/form' %>
-  <%= submit_tag 'Speichern' %>
-  <%= hidden_field 'financial_transaction', 'order_group_id' %>
-<% end -%>
-<br />
-<%= link_to 'Zurück', :controller => 'finance' %>

app/views/layouts/_main_tabnav.html.erb

@@ -26,10 +26,10 @@
           { :name => "Suppliers", :url => suppliers_path, :access? => (u.role_suppliers?) }
         ]
       },
-      { :name => "Finance", :url => "/finance", :active => ["finance", "invoices"],
+      { :name => "Finance", :url => "/finance", :active => ["finance", "invoices", "transactions"],
         :access? => (u.role_finance?),
         :subnav => [
-          { :name => "Ordergroups", :url => "/finance/listOrdergroups" },
+          { :name => "Manage accounts", :url => "/finance/transactions" },
           { :name => "Balance orders", :url => "/finance/listOrders" },
           { :name => "Invoices", :url => finance_invoices_path }
         ]