diff --git a/app/controllers/deliveries_controller.rb b/app/controllers/deliveries_controller.rb
index 86eedc14..3f18899f 100644
--- a/app/controllers/deliveries_controller.rb
+++ b/app/controllers/deliveries_controller.rb
@@ -50,57 +50,22 @@ class DeliveriesController < ApplicationController
     redirect_to supplier_deliveries_url(@supplier)
   end
   
-  # three possibilites to fill a new_stock_article form
-  # (1) start from blank or use params
-  def new_stock_article
-    @stock_article = @supplier.stock_articles.build(params[:stock_article])
-
-    render :layout => false
-  end
-  
-  # (2) StockArticle as template
-  def copy_stock_article
-    @stock_article = StockArticle.find(params[:old_stock_article_id]).dup
-    
-    render :layout => false
-  end
-  
-  # (3) non-stock Article as template
-  def derive_stock_article
-    @stock_article = Article.find(params[:old_article_id]).becomes(StockArticle).dup
-    
-    render :layout => false
-  end
-
-  def create_stock_article
-    @stock_article = StockArticle.new(params[:stock_article])
-    
-    if @stock_article.valid? and @stock_article.save
-      render :layout => false
-    else
-      render :action => 'new_stock_article', :layout => false
-    end
-  end
-
-  def edit_stock_article
-    @stock_article = StockArticle.find(params[:stock_article_id])
-    render :layout => false
-  end
-
-  def update_stock_article
-    @stock_article = StockArticle.find(params[:stock_article][:id])
-    
-    if @stock_article.update_attributes(params[:stock_article])
-      render :layout => false
-    else
-      render :action => 'edit_stock_article', :layout => false
-    end
-  end
-
   def add_stock_change
     @stock_change = StockChange.new
     @stock_change.stock_article = StockArticle.find(params[:stock_article_id])
     render :layout => false
   end
+  
+  def form_on_stock_article_create # See publish/subscribe design pattern in /doc.
+    @stock_article = StockArticle.find(params[:id])
+    
+    render :layout => false
+  end
+
+  def form_on_stock_article_update # See publish/subscribe design pattern in /doc.
+    @stock_article = StockArticle.find(params[:id])
+    
+    render :layout => false
+  end
 
 end
diff --git a/app/helpers/deliveries_helper.rb b/app/helpers/deliveries_helper.rb
index b23107cc..2ef5d14b 100644
--- a/app/helpers/deliveries_helper.rb
+++ b/app/helpers/deliveries_helper.rb
@@ -25,13 +25,4 @@ module DeliveriesHelper
     return output.html_safe
   end
   
-  def stock_article_price_hint(stock_article)
-    t('simple_form.hints.stock_article.edit_stock_article.price',
-      :stock_article_copy_link => link_to(t('.copy_stock_article'),
-        copy_stock_article_supplier_deliveries_path(@supplier, :old_stock_article_id => stock_article.id),
-        :remote => true
-      )
-    )
-  end
-  
 end
diff --git a/app/views/deliveries/_form.html.haml b/app/views/deliveries/_form.html.haml
index 3e1a3b6c..533f44c3 100644
--- a/app/views/deliveries/_form.html.haml
+++ b/app/views/deliveries/_form.html.haml
@@ -42,7 +42,7 @@
         }
         if('new' == selectedArticle.id) {
           $.ajax({
-            url: '#{new_stock_article_supplier_deliveries_path(@supplier)}',
+            url: '#{new_stock_article_path}',
             type: 'get',
             data: {stock_article: {name: selectedArticle.text}},
             contentType: 'application/json; charset=UTF-8'
@@ -52,7 +52,7 @@
         }
         if('' != selectedArticle.id) {
           $.ajax({
-            url: '#{derive_stock_article_supplier_deliveries_path(@supplier)}',
+            url: '#{derive_stock_articles_path}',
             type: 'get',
             data: {old_article_id: selectedArticle.id},
             contentType: 'application/json; charset=UTF-8'
@@ -61,6 +61,26 @@
           return true;
         }
       });
+      
+      // Subscribe to database changes.
+      // See publish/subscribe design pattern in /doc.
+      $(document).on('StockArticle#create', function(e) {
+        $.ajax({
+          url: '#{form_on_stock_article_create_supplier_deliveries_path(@supplier)}',
+          type: 'get',
+          data: {id: e.stock_article_id},
+          contentType: 'application/json; charset=UTF-8'
+        });
+      });
+      
+      $(document).on('StockArticle#update', function(e) {
+        $.ajax({
+          url: '#{form_on_stock_article_update_supplier_deliveries_path(@supplier)}',
+          type: 'get',
+          data: {id: e.stock_article_id},
+          contentType: 'application/json; charset=UTF-8'
+        });
+      });
     });
     
     function mark_article_for_delivery(stock_article_id) {
@@ -96,7 +116,7 @@
       %tr
         %th{:colspan => 5}
           - if articles_for_select2(@supplier).empty?
-            = link_to t('.create_stock_article'), new_stock_article_supplier_deliveries_path(@supplier), :remote => true, :class => 'btn'
+            = link_to t('.create_stock_article'), new_stock_article_path, :remote => true, :class => 'btn'
           - else
             %input#new_stock_article{:style => 'width: 500px;'}
     %tbody
diff --git a/app/views/deliveries/_stock_article_for_adding.html.haml b/app/views/deliveries/_stock_article_for_adding.html.haml
index b43df782..956d8379 100644
--- a/app/views/deliveries/_stock_article_for_adding.html.haml
+++ b/app/views/deliveries/_stock_article_for_adding.html.haml
@@ -5,7 +5,7 @@
   %td= article.unit
   %td= article.article_category.name
   %td
-    = link_to t('.action_edit'), edit_stock_article_supplier_deliveries_path(@supplier, :stock_article_id => article.id), remote: true, class: 'btn btn-mini'
-    = link_to t('.action_other_price'), copy_stock_article_supplier_deliveries_path(@supplier, :old_stock_article_id => article.id), remote: true, class: 'btn btn-mini'
+    = link_to t('.action_edit'), edit_stock_article_path(article), remote: true, class: 'btn btn-mini'
+    = link_to t('.action_other_price'), stock_article_copy_path(article), remote: true, class: 'btn btn-mini'
     - deliver_button_disabled = ( @delivery and @delivery.includes_article? article ) ? ( 'disabled' ) : ( false )
     = link_to t('.action_add_to_delivery'), add_stock_change_supplier_deliveries_path(@supplier, :stock_article_id => article.id), :method => :post, remote: true, class: 'button-add-stock-change btn btn-mini btn-primary', disabled: deliver_button_disabled
diff --git a/app/views/deliveries/_stock_article_form.html.haml b/app/views/deliveries/_stock_article_form.html.haml
deleted file mode 100644
index 5fdce8de..00000000
--- a/app/views/deliveries/_stock_article_form.html.haml
+++ /dev/null
@@ -1,23 +0,0 @@
-- url = ( stock_article.new_record? ) ? ( create_stock_article_supplier_deliveries_path(@supplier) ) : ( update_stock_article_supplier_deliveries_path(@supplier) )
-= simple_form_for stock_article, url: url, remote: true, validate: true do |f|
-  = f.association :supplier, :as => :hidden
-  = f.hidden_field :id unless stock_article.new_record?
-  .modal-header
-    = link_to t('ui.marks.close').html_safe, '#', class: 'close', data: {dismiss: 'modal'}
-    %h3= t 'activerecord.models.stock_article'
-  .modal-body
-    = f.input :name
-    = f.input :unit
-    = f.input :note
-    - if stock_article.new_record?
-      = f.input :price
-      = f.input :tax, :wrapper => :append do
-        = f.input_field :tax
-        %span.add-on %
-      = f.input :deposit
-    - else
-      = f.input :price, :input_html => {:disabled => 'disabled'}, :hint => stock_article_price_hint(stock_article).html_safe
-    = f.association :article_category
-  .modal-footer
-    = link_to t('ui.close'), '#', class: 'btn', data: {dismiss: 'modal'}
-    = f.submit :class => 'btn btn-primary', 'data-disable-with' => t('ui.please_wait')
diff --git a/app/views/deliveries/copy_stock_article.js.erb b/app/views/deliveries/copy_stock_article.js.erb
deleted file mode 100644
index de5d260e..00000000
--- a/app/views/deliveries/copy_stock_article.js.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-$('#modalContainer').html(
-  '<%= j(render(:partial => "stock_article_form", :locals => {:stock_article => @stock_article})) %>'
-);
-
-$('#modalContainer').modal();
diff --git a/app/views/deliveries/derive_stock_article.js.erb b/app/views/deliveries/derive_stock_article.js.erb
deleted file mode 100644
index de5d260e..00000000
--- a/app/views/deliveries/derive_stock_article.js.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-$('#modalContainer').html(
-  '<%= j(render(:partial => "stock_article_form", :locals => {:stock_article => @stock_article})) %>'
-);
-
-$('#modalContainer').modal();
diff --git a/app/views/deliveries/edit_stock_article.js.erb b/app/views/deliveries/edit_stock_article.js.erb
deleted file mode 100644
index de5d260e..00000000
--- a/app/views/deliveries/edit_stock_article.js.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-$('#modalContainer').html(
-  '<%= j(render(:partial => "stock_article_form", :locals => {:stock_article => @stock_article})) %>'
-);
-
-$('#modalContainer').modal();
diff --git a/app/views/deliveries/create_stock_article.js.erb b/app/views/deliveries/form_on_stock_article_create.js.erb
similarity index 64%
rename from app/views/deliveries/create_stock_article.js.erb
rename to app/views/deliveries/form_on_stock_article_create.js.erb
index cb9d0159..25360761 100644
--- a/app/views/deliveries/create_stock_article.js.erb
+++ b/app/views/deliveries/form_on_stock_article_create.js.erb
@@ -1,7 +1,5 @@
-$('div.container-fluid').prepend(
-  '<%= j(render(:partial => 'shared/alert_success', :locals => {:alert_message => t('.notice', :name => @stock_article.name)})) %>'
-);
-
+// Handle more advanced DOM update after AJAX database manipulation.
+// See publish/subscribe design pattern in /doc.
 (function() {
   $('#stock_articles_for_adding tr').removeClass('success');
   
@@ -12,5 +10,3 @@ $('div.container-fluid').prepend(
   $('#stock_articles_for_adding tbody').append(stock_article_for_adding);
   updateSort('#stock_articles_for_adding');
 })();
-
-$('#modalContainer').modal('hide');
diff --git a/app/views/deliveries/update_stock_article.js.erb b/app/views/deliveries/form_on_stock_article_update.js.erb
similarity index 81%
rename from app/views/deliveries/update_stock_article.js.erb
rename to app/views/deliveries/form_on_stock_article_update.js.erb
index 7b2d56d6..a993ab8d 100644
--- a/app/views/deliveries/update_stock_article.js.erb
+++ b/app/views/deliveries/form_on_stock_article_update.js.erb
@@ -1,7 +1,5 @@
-$('div.container-fluid').prepend(
-  '<%= j(render(:partial => 'shared/alert_success', :locals => {:alert_message => t('.notice', :name => @stock_article.name)})) %>'
-);
-
+// Handle more advanced DOM update after AJAX database manipulation.
+// See publish/subscribe design pattern in /doc.
 (function() {
   // update entry in stock_article table
   
@@ -28,5 +26,3 @@ $('div.container-fluid').prepend(
   
   updateSort('#stock_changes');
 })();
-
-$('#modalContainer').modal('hide');
diff --git a/app/views/deliveries/new_stock_article.js.erb b/app/views/deliveries/new_stock_article.js.erb
deleted file mode 100644
index de5d260e..00000000
--- a/app/views/deliveries/new_stock_article.js.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-$('#modalContainer').html(
-  '<%= j(render(:partial => "stock_article_form", :locals => {:stock_article => @stock_article})) %>'
-);
-
-$('#modalContainer').modal();
diff --git a/app/views/stockit/derive.js.erb b/app/views/stockit/derive.js.erb
new file mode 100644
index 00000000..e3bc3321
--- /dev/null
+++ b/app/views/stockit/derive.js.erb
@@ -0,0 +1,9 @@
+$('#modalContainer').html('<%= j(render(
+  :partial => "form",
+  :locals => {
+    :title => t('.title'),
+    :stock_article => @stock_article
+  }
+)) %>');
+
+$('#modalContainer').modal();
diff --git a/config/routes.rb b/config/routes.rb
index 62678230..efb355d9 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -88,8 +88,7 @@ Foodsoft::Application.routes.draw do
     resources :stock_articles, :to => 'stockit' do
       get :copy
       collection do
-        get :articles_search
-        get :fill_new_stock_article_form
+        get :derive
         
         get :index_on_stock_article_create
         get :index_on_stock_article_update
@@ -102,15 +101,12 @@ Foodsoft::Application.routes.draw do
       get :shared_suppliers, :on => :collection
 
       resources :deliveries do
-        post :add_stock_change, :on => :collection
-        
-        get :new_stock_article, :on => :collection
-        get :copy_stock_article, :on => :collection
-        get :derive_stock_article, :on => :collection
-        post :create_stock_article, :on => :collection
-        
-        get :edit_stock_article, :on => :collection
-        put :update_stock_article, :on => :collection
+        collection do
+          post :add_stock_change
+          
+          get :form_on_stock_article_create
+          get :form_on_stock_article_update
+        end
       end
 
       resources :articles do