Moved balancing logic into new namespace 'finance'.

app/views/finance/balancing/_editNote.haml

@@ -7,4 +7,4 @@
   %p
     = submit_tag "Speichern"
     |
-    = link_to_remote 'Abbrechen', :update => 'results', :url => { :action => 'editOrder', :id => @order, :view => 'groupsOverview' }, :before => "Element.show('loader')", :success => "Element.hide('loader')"
+    = link_to_remote 'Abbrechen', :update => 'results', :url => { :action => 'edit', :id => @order, :view => 'groupsOverview' }, :before => "Element.show('loader')", :success => "Element.hide('loader')"

app/views/finance/balancing/confirm.html.haml

@@ -11,6 +11,6 @@
         %td= number_to_currency(groupResult.price)
   %p
     %div{:style => "float:left"}
-      = button_to "Abschließen", :action => "balanceOrder", :id => @order
+      = button_to "Abschließen", :action => "close", :id => @order
     %div{:style => "float:right"}
-      = link_to 'Zurück zur Abrechnung', :action => "editOrder", :id => @order
+      = link_to 'Zurück zur Abrechnung', :action => "new", :id => @order

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

@@ -23,14 +23,14 @@
         %tbody
           - @orders.each do |order|
             %tr{:class => cycle("even","odd", :name => "order")}
-              %td= link_to truncate(order.name), :action => "editOrder", :id => order
+              %td= link_to truncate(order.name), :action => "new", :id => order
               %td=h order.supplier ? order.supplier.name : _('nonexistent')
               %td=h format_time(order.ends) unless order.ends.nil?
               %td= order.booked ? "abgerechnet (#{number_to_currency order.fcProfit})" : "beendet"
               %td= order.updated_by.nil? ? '??' : order.updated_by.nick
               %td
                 - unless order.booked
-                  = link_to "abrechnen", :action => "editOrder", :id => order
+                  = link_to "abrechnen", :action => "new", :id => order
                   | 
                   = link_to 'auf "gebucht" setzen', {:action => 'setAllBooked', :id => order}, :confirm => 'Wirklich alle Gruppenbestellungen für diese Bestellung auf "gebucht" setzen?', :method => "post"
     - else

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

@@ -1,4 +1,5 @@
 %h1 Bestellung abrechnen
+
 - if @order.booked
   %p
     %b Achtung, Bestellung wurde schon abgerechnet!
@@ -15,7 +16,7 @@
   .column_content
     %ul
       - unless @order.booked
-        %li= link_to "Bestellung abschließen", :action => "confirmOrder", :id => @order
+        %li= link_to "Bestellung abschließen", :action => "confirm", :id => @order
 
 .right_column{:style => 'clear:both;width: 28%'}
   .box_title
@@ -28,7 +29,7 @@
         %p Hier kannst Du deine Abrechnung kommentieren
     %small Protokoll bearbeiten:
     = link_to_remote image_tag("b_edit.png", :size => "16x16", :border => "0"), |
-       :update => 'results', :url => { :action => 'editOrder', :id => @order, :view => 'editNote' }, | 
+       :update => 'results', :url => { :action => 'new', :id => @order, :view => 'editNote' }, |
        :before => "Element.show('loader')", :success => "Element.hide('loader')" |
     %hr/
     #comments
@@ -38,9 +39,9 @@
   .box_title
     #editOrderNav
       %ul
-        %li= link_to_remote 'Gruppenübersicht', :update => 'results', :url => { :action => 'editOrder', :id => @order, :view => 'groupsOverview' }, :before => "Element.show('loader')", :success => "Element.hide('loader')"
-        %li= link_to_remote 'Artikelübersicht', :update => 'results', :url => { :action => 'editOrder', :id => @order, :view => 'articlesOverview' }, :before => "Element.show('loader')", :success => "Element.hide('loader')"
-        %li= link_to_remote 'Bestellung bearbeiten', :update => 'results', :url => { :action => 'editOrder', :id => @order, :view => 'editResults' }, :before => "Element.show('loader')", :success => "Element.hide('loader')"
+        %li= link_to_remote 'Gruppenübersicht', :update => 'results', :url => { :action => 'new', :id => @order, :view => 'groupsOverview' }, :before => "Element.show('loader')", :success => "Element.hide('loader')"
+        %li= link_to_remote 'Artikelübersicht', :update => 'results', :url => { :action => 'new', :id => @order, :view => 'articlesOverview' }, :before => "Element.show('loader')", :success => "Element.hide('loader')"
+        %li= link_to_remote 'Bestellung bearbeiten', :update => 'results', :url => { :action => 'new', :id => @order, :view => 'editResults' }, :before => "Element.show('loader')", :success => "Element.hide('loader')"
   .column_content
     #results
       = render :partial => 'groupsOverview'

app/views/finance/index.haml

@@ -3,7 +3,7 @@
   .box_title
     %h2 Unpaid invoices
   .column_content
-    %p= link_to "Show all invoices", invoices_path
+    %p= link_to "Show all invoices", finance_invoices_path
     %table.list
       %thead
         %tr
@@ -17,13 +17,13 @@
             %td= format_date(invoice.date)
             %td= number_to_currency(invoice.amount)
             %td=h invoice.supplier.name
-            %td= link_to "Edit", edit_invoice_path(invoice)
+            %td= link_to "Edit", edit_finance_invoice_path(invoice)
 
   .box_title
     %h2 letzte Überweisungen
   .column_content
     %p
-      = link_to "Bestellgruppen", :action => "listOrdergroups"
+      = link_to "Bestellgruppen", :controller => 'finance/transactions'
     %table.list
       %thead
         %tr
@@ -43,7 +43,7 @@
   .box_title
     %h2 noch nicht abgerechnet
   .column_content
-    %p= link_to "Bestellungsübersicht", :action => "listOrders"
+    %p= link_to "Bestellungsübersicht", :controller => 'finance/orders'
     - unless @orders.empty?
       %table.list
         %thead