Last part of order refactoring. Now order_article create/update is possible.

app/views/finance/balancing/_editArticleResult.haml

@@ -1,8 +0,0 @@
-%h2 
-  Bearbeiten von
-  = @article.name
-
-- remote_form_for 'order_article_result', @article, :url => {:action => 'updateArticleResult', :id => @article }, |
-  :before => "Element.show('loader')", :success => "Element.hide('loader')" do |@form| |
-  
-  = render :partial => "articleResultForm"  

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

@@ -0,0 +1,7 @@
+%h2 
+  Bearbeiten von
+  = @order_article.article.name
+
+- remote_form_for :order_article, :url => {:action => 'update_order_article', :id => @order_article }, |
+  :before => "Element.show('loader')", :success => "Element.hide('loader')" do |
+  = render :partial => "order_article_form"

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

@@ -1,7 +1,7 @@
 %p{:style => "float:left"}
   %b Lieferung bearbeiten  
 %p{:style => "float:right"}
-  //= remote_link_to "Artikel hinzufügen", :url => {:action => "newArticleResult", :id => @order}
+  = remote_link_to "Artikel hinzufügen", :url => {:action => "new_order_article", :id => @order}
 
 %table{:class => "ordered_articles", :style => "clear:both"}
   %thead

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

@@ -1,7 +1,15 @@
 %h2
   Neuer gelieferter Artikel die Bestellung
 
-- remote_form_for order_article, :url => {:action => 'create_order_article' }, |
+- remote_form_for :order_article, :url => {:action => 'create_order_article', :order_id => @order.id}, |
   :before => "Element.show('loader')", :success => "Element.hide('loader')" do |form| |
-  
-  = render :partial => 'order_article_form', :locals => {:form => form}
+  %p
+    Suche im Katalog
+    = text_field_with_auto_complete :article, :name, {}, |
+      {:url => {:action => 'auto_complete_for_article_name', :order_id => @order.id}, |
+       :after_update_element => 'setHiddenId'} |
+  %p
+    = form.hidden_field :article_id, :id => 'hidden_id'
+    = submit_tag "Neuen Artikel hinzufügen"
+    |
+    = link_to_function "Abbrechen", "Element.hide('edit_box')"

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

@@ -13,8 +13,8 @@
 %td= order_article.price.tax
 %td= order_article.price.deposit
 %td
-  //= remote_link_to icon(:edit), |
-  //:url => {:action => 'edit_order_article', :id => order_article} |
+  = remote_link_to icon(:edit), |
+  :url => {:action => 'edit_order_article', :id => order_article} |
 %td
   = remote_link_to icon(:delete), :confirm => 'Bist du sicher?', |
     :url => {:action => 'destroy_order_article', :id => order_article}, |

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

@@ -1,25 +1,25 @@
-= form.error_messages
+- if @error
+  %b= @error
 %table
   %tr
     %th Name
     %th Nr.
     %th
       %abbr{:title=>"Anzahl gelieferter Gebinde"} Menge
-    %th GebGr
     %th Einheit
+    %th GebGr
     %th netto
     %th MwSt.
     %th Pfand
   %tr
-    %td= form.text_field 'name', :size => 20
-    %td= form.text_field 'order_number', :size => 3
-    %td= form.text_field 'units_to_order', :size => 5
-    %td= form.text_field 'unit_quantity', :size => 3
-    %td= form.text_field 'unit', :size => 5
-    %td= form.text_field 'net_price', :size => 3
-    %td= form.text_field 'tax', :size => 3
-    %td= form.text_field 'deposit', :size => 3
-= form.hidden_field "order_id"
+    %td= text_field_tag 'article[name]', @order_article.article.name, :size => 20
+    %td= text_field_tag 'article[order_number]', @order_article.article.order_number, :size => 3
+    %td= text_field_tag 'order_article[units_to_order]', @order_article.units_to_order, :size => 5
+    %td= text_field_tag 'article[unit]', @order_article.article.unit, :size => 5
+    %td= text_field_tag 'price[unit_quantity]', @order_article.price.unit_quantity, :size => 3
+    %td= text_field_tag 'price[price]', @order_article.price.price, :size => 3
+    %td= text_field_tag 'price[tax]', @order_article.price.tax, :size => 3
+    %td= text_field_tag 'price[deposit]', @order_article.price.deposit, :size => 3
 %br/
 = submit_tag "Speichern"
 |