Introduced StockChange. Implemented first part of stockit-logic with updating article's quantity.

app/views/deliveries/_form.html.haml

@@ -0,0 +1,16 @@
+- form_for([@supplier,@delivery]) do |f|
+  = f.error_messages
+  = f.hidden_field :supplier_id
+  %p
+    %b= f.label :delivered_on
+    = f.date_select :delivered_on
+
+  %h2 Artikel
+  #stock_changes
+    = yield
+  %br/
+  = add_article_link
+  %p
+    = f.submit "Speichern"
+
+= link_to 'Zurück', supplier_deliveries_path(@supplier)

app/views/deliveries/_stock_change.html.haml

@@ -0,0 +1,6 @@
+%p
+  - fields_for "delivery[stock_change_attributes][]", stock_change do |form|
+    = form.select :article_id, articles_for_select(@supplier), :prompt => " -- Artikel auswählen -- "
+    Menge
+    = form.text_field :quantity, :size => 5, :autocomplete => 'off'
+    = link_to_function "Löschen", "$(this).up('p').remove()"

app/views/deliveries/edit.html.erb

@@ -1,17 +0,0 @@
-<h1>Editing delivery</h1>
-
-<% form_for([@supplier,@delivery]) do |f| %>
-  <%= f.error_messages %>
-  <%= f.hidden_field :supplier_id %>
-
-  <p>
-    <%= f.label :delivered_on %><br />
-    <%= f.date_select :delivered_on %>
-  </p>
-  <p>
-    <%= f.submit "Update" %>
-  </p>
-<% end %>
-
-<%= link_to 'Show', [@supplier,@delivery] %> |
-<%= link_to 'Back', supplier_deliveries_path(@supplier) %>

app/views/deliveries/edit.html.haml

@@ -0,0 +1,16 @@
+- title "Lieferung bearbeiten"
+
+%p
+  %b Lieferant:
+  = @supplier.name
+
+- render :layout => 'form' do
+  %table{:style => "width:40em"}
+    - for stock_change in @delivery.stock_changes
+      %tr[stock_change]
+        %td= stock_change.article.name
+        %td= stock_change.quantity
+        %td
+          = link_to_remote "Artikel entfernen", |
+            :url => drop_stock_change_supplier_delivery_path(@supplier, @delivery, :stock_change_id => stock_change), |
+            :method => :post |

app/views/deliveries/index.html.erb

@@ -1,22 +0,0 @@
-<% title "#{@supplier.name}/deliveries" %>
-
-<table>
-  <tr>
-    <th>Delivered on</th>
-    <th>Invoice</th>
-  </tr>
-
-<% for delivery in @deliveries %>
-  <tr>
-    <td><%=h delivery.delivered_on %></td>
-    <td><%=h "invoice ..." %></td>
-    <td><%= link_to 'Show', [@supplier, delivery] %></td>
-    <td><%= link_to 'Edit', edit_supplier_delivery_path(@supplier,delivery) %></td>
-    <td><%= link_to 'Destroy', [@supplier,delivery], :confirm => 'Are you sure?', :method => :delete %></td>
-  </tr>
-<% end %>
-</table>
-
-<br />
-
-<%= link_to 'New delivery', new_supplier_delivery_path(@supplier) %>

app/views/deliveries/index.html.haml

@@ -0,0 +1,16 @@
+- title "#{@supplier.name}/deliveries"
+
+%table{:style => "width:50em"}
+  %tr
+    %th Delivered on
+    %th Invoice
+  - for delivery in @deliveries
+    %tr
+      %td=h delivery.delivered_on
+      %td=h "invoice ..."
+      %td= link_to 'Show', [@supplier, delivery]
+      %td= link_to 'Edit', edit_supplier_delivery_path(@supplier,delivery)
+      %td= link_to 'Destroy', [@supplier,delivery], :confirm => 'Are you sure?', :method => :delete
+
+%br/
+= link_to 'New delivery', new_supplier_delivery_path(@supplier)

app/views/deliveries/new.html.erb

@@ -1,16 +0,0 @@
-<h1>New delivery</h1>
-
-<% form_for([@supplier,@delivery]) do |f| %>
-  <%= f.error_messages %>
-  <%= f.hidden_field :supplier_id %>
-
-  <p>
-    <%= f.label :delivered_on %><br />
-    <%= f.date_select :delivered_on %>
-  </p>
-  <p>
-    <%= f.submit "Create" %>
-  </p>
-<% end %>
-
-<%= link_to 'Back', supplier_deliveries_path(@supplier) %>

app/views/deliveries/new.html.haml

@@ -0,0 +1,4 @@
+- title "Neue Lieferung von #{@supplier.name}"
+
+- render :layout => 'form' do
+  = render :partial => 'stock_change', :collection => @delivery.stock_changes

app/views/deliveries/show.html.erb

@@ -1,13 +0,0 @@
-<p>
-  <b>Supplier:</b>
-  <%=h @delivery.supplier_id %>
-</p>
-
-<p>
-  <b>Delivered on:</b>
-  <%=h @delivery.delivered_on %>
-</p>
-
-
-<%= link_to 'Edit', edit_supplier_delivery_path(@supplier,@delivery) %> |
-<%= link_to 'Back', supplier_deliveries_path(@supplier) %>

app/views/deliveries/show.html.haml

@@ -0,0 +1,25 @@
+- title "Lieferung anzeigen"
+
+%p
+  %b Lieferant:
+  =h @delivery.supplier.name
+%p
+  %b Delivered on:
+  =h @delivery.delivered_on
+
+%h2 Artikel
+%table.list{:style => "width:30em"}
+  %tr
+    %th Artikel
+    %th Einheit
+    %th Menge
+  - for stock_change in @delivery.stock_changes.find :all, :include => :article
+    %tr
+      %td= stock_change.article.name
+      %td= stock_change.article.unit
+      %td= stock_change.quantity
+
+%br/
+= link_to 'Edit', edit_supplier_delivery_path(@supplier,@delivery)
+|
+= link_to 'Back', supplier_deliveries_path(@supplier)