Merge branch 'master' into improve-delivery-workflow-further

2013-07-11 19:24:37 +02:00 · 2013-07-11 19:24:37 +02:00 · 469abb753d
commit 469abb753d
parent 5ed2659bc6 2ef7e58b0b
4 changed files with 12 additions and 2 deletions
--- a/app/helpers/finance/order_articles_helper.rb
+++ b/app/helpers/finance/order_articles_helper.rb
@ -4,7 +4,7 @@ module Finance::OrderArticlesHelper
    if @order.stockit?
      StockArticle.order('articles.name')
    else
-      @order.supplier.articles.order('articles.name')
+      @order.supplier.articles.undeleted.order('articles.name')
    end
  end
 end