Created namespace 'finance' and moved invoices into it.

app/views/ordering/_currentOrders.haml

@@ -1,34 +1,32 @@
-- if @orderGroup
-  .right_column{:style => "width:70%"}
-    .box_title
-      %h2=_ "Running orders"
-    .column_content
-      - unless @currentOrders.empty?
-        %table.list
-          %thead
-            %tr
-              %th=_ "Name"
-              %th=_ "Supplier"
-              %th=_ "End"
-              %th=_ "Who ordered?"
-              %th=_ "Sum"
-          %tbody
-            - total = 0
-            - @currentOrders.each do |order|
-              %tr{:class => cycle('even', 'odd', :name => 'current_orders')}
-                %td= link_to order.name, :controller => 'ordering', :action => 'order', :id => order 
-                %td=h order.supplier.name
-                %td=h format_time(order.ends) unless order.ends.nil?
-                - if (groupOrder = order.group_orders.find(:first, :conditions => ["order_group_id = ?", @orderGroup.id]))
-                  - total += groupOrder.price
-                  %td=h groupOrder.updated_by.nil? ? '??' : "#{groupOrder.updated_by.nick} (#{format_time(groupOrder.updated_on)})"
-                  %td= number_to_currency(groupOrder.price)
-                - else
-                  %td
-                  %td
-        - if total > 0
-          %p
-            =_ "Total sum"
-            %b= number_to_currency(total)
-      - else
-        %i=_ "There aren't current orders at the moment."
+.box_title
+  %h2=_ "Running orders"
+.column_content
+  - unless @currentOrders.empty?
+    %table.list
+      %thead
+        %tr
+          %th=_ "Name"
+          %th=_ "Supplier"
+          %th=_ "End"
+          %th=_ "Who ordered?"
+          %th=_ "Sum"
+      %tbody
+        - total = 0
+        - @currentOrders.each do |order|
+          %tr{:class => cycle('even', 'odd', :name => 'current_orders')}
+            %td= link_to order.name, :controller => 'ordering', :action => 'order', :id => order
+            %td=h order.supplier.name
+            %td=h format_time(order.ends) unless order.ends.nil?
+            - if (groupOrder = order.group_orders.find(:first, :conditions => ["order_group_id = ?", @orderGroup.id]))
+              - total += groupOrder.price
+              %td=h groupOrder.updated_by.nil? ? '??' : "#{groupOrder.updated_by.nick} (#{format_time(groupOrder.updated_on)})"
+              %td= number_to_currency(groupOrder.price)
+            - else
+              %td
+              %td
+    - if total > 0
+      %p
+        =_ "Total sum"
+        %b= number_to_currency(total)
+  - else
+    %i=_ "There aren't current orders at the moment."

app/views/ordering/index.haml

@@ -19,12 +19,13 @@
         %th= _('Available')
         %th{:class => "currency"}= number_to_currency(@orderGroup.account_balance - @currentOrdersValue - @nonbookedOrdersValue)
 
-// Current Orders
-= render :partial => "currentOrders"
+.right_column{:style => "width:70%"}
+  // Current Orders
+  - if @orderGroup
+    = render :partial => "currentOrders"
 
-// finished, nonbooked Orders
-- unless @finishedOrders.empty?
-  .right_column{:style => "width:70%"}
+  // finished, nonbooked Orders
+  - unless @finishedOrders.empty?
     .box_title
       %h2=  _('unrecorded orders')
     .column_content
@@ -34,9 +35,8 @@
           = _('total order value')
           %b= number_to_currency(@nonbookedOrdersValue)
 
-// bookedOrders
-- unless @bookedOrders.empty?
-  .right_column{:style => "width:70%"}
+  // bookedOrders
+  - unless @bookedOrders.empty?
     .box_title
       %h2=  _('balanced orders')
     .column_content