First part of stock-integratino. Orders with supplier_id == 0 become stockorders.

app/views/orders/_form.html.haml

@@ -7,7 +7,7 @@
     = form.hidden_field :supplier_id
     %p
       Lieferant:
-      = @order.supplier.name
+      = @order.name
     %p
       Notiz
       %br/
@@ -31,7 +31,7 @@
           %option{:value => "-1", :selected => "selected"}=_ "Choose an order..."
           - i = -1
           - for order in @template_orders
-            %option{:value => (i += 1)}= "#{h(order.supplier.name)} bis #{order.ends.strftime('%d. %b')}"
+            %option{:value => (i += 1)}= "#{h(order.name)} bis #{order.ends.strftime('%d. %b')}"
     %table.list
       %tr
         %th= check_box_tag 'checkall', "1", false, { :onclick => "checkUncheckAll(this)" }
@@ -41,7 +41,7 @@
         %th=_ "Manufacturer"
         %th=_ "Unit quantity"
         %th=_ "Price"
-      - for category_name, articles in @order.supplier.get_articles_for_ordering
+      - for category_name, articles in @order.articles_for_ordering
         %tr{:style => "background-color:#EFEFEF"}
           %td
           %td{:colspan => "6", :style => "text-align:left"}
@@ -64,7 +64,4 @@
           =_ "Select all"
 
 - if (@template_orders && !@template_orders.empty?)
-  = render :partial => 'template_orders_script'
-
-
-          
+  = render :partial => 'template_orders_script'

app/views/orders/_orders.html.haml

@@ -12,7 +12,7 @@
   %tbody
     - @orders.each do |order|
       %tr{:class => cycle('even', 'odd', :name => 'orders')}
-        %td=h order.supplier.name
+        %td=h order.name
         %td=h format_time(order.starts)
         %td=h format_time(order.ends)
         %td= order.state

app/views/orders/articlesPdf.pdf.prawn

@@ -1,5 +1,5 @@
 end_date = @order.ends.strftime('%d.%m.%Y')
-title = "#{@order.supplier.name} | beendet am #{end_date}"
+title = "#{@order.name} | beendet am #{end_date}"
 
 # Define header and footer
 pdf.header [pdf.margin_box.left,pdf.margin_box.top+30] do

app/views/orders/faxPdf.pdf.prawn

@@ -25,7 +25,7 @@ end
 
 # Recipient
 pdf.bounding_box [pdf.margin_box.left,pdf.margin_box.top-60], :width => 200 do
-  pdf.text @order.supplier.name
+  pdf.text @order.name
   pdf.move_down 5
   pdf.text @order.supplier.address
   pdf.move_down 5

app/views/orders/groupsPdf.pdf.prawn

@@ -1,5 +1,5 @@
 end_date = @order.ends.strftime('%d.%m.%Y')
-title = "Gruppensortierung für #{@order.supplier.name}, beendet am #{end_date}"
+title = "Gruppensortierung für #{@order.name}, beendet am #{end_date}"
 
 # Define header and footer
 pdf.header [pdf.margin_box.left,pdf.margin_box.top+20] do

app/views/orders/index.haml

@@ -24,7 +24,7 @@
           - for order in @open_orders
             - active = (order.open? and order.ends < Time.now) ? " active" : ""
             %tr{:class => cycle('even', 'odd', :name => 'open_orders') + active}
-              %td=h order.supplier.name
+              %td=h order.name
               %td=h format_time(order.ends) unless order.ends.nil?
               %td=h truncate(order.note)
               %td= link_to "Beenden", finish_order_path(order), :confirm => _("Are you really sure to finish the order?"), :method => :post

app/views/orders/matrixPdf.pdf.prawn

@@ -1,4 +1,4 @@
-title = "#{@order.supplier.name}, beendet am #{@order.ends.strftime('%d.%m.%Y')}"
+title = "#{@order.name}, beendet am #{@order.ends.strftime('%d.%m.%Y')}"
 
 # Define header and footer
 pdf.header [pdf.margin_box.left,pdf.margin_box.top+20] do

app/views/orders/new.html.haml

@@ -1,7 +1,7 @@
-- title _("New order")
+- title "Neue Bestellung anlegen"
 
 - form_for @order do |form|
   = render :partial => 'form', :locals => { :form => form }
-  = submit_tag _("Put the order online")
+  = submit_tag "Bestellung online stellen"
   |
   = link_to "Abbrechen", orders_path

app/views/orders/show.haml

@@ -1,10 +1,10 @@
-- title _("Show order")
+- title "Bestellung: #{@order.name}"
 #element_navigation
-  = link_to_unless @order.previous == @order, "<< #{@order.previous.supplier.name}", @order.previous
+  = link_to_unless @order.previous == @order, "<< #{@order.previous.name}", @order.previous
   |
   = link_to _("Overview"), orders_path
   |
-  = link_to_unless @order.next == @order, "#{@order.next.supplier.name} >>", @order.next
+  = link_to_unless @order.next == @order, "#{@order.next.name} >>", @order.next
 
 // Order summary
 .left_column{:style => "width:65em"}
@@ -16,7 +16,7 @@
         %b{:style => "color:red"}=_ "Order isn't closed yet"
     %p
       Lieferant:
-      %b=h @order.supplier.name
+      %b=h @order.name
     - unless @order.note.empty?
       %p
         Notiz: