Merge branch 'master' into stock_article_quantity_history

2013-07-11 19:23:52 +02:00 · 2013-07-11 19:23:52 +02:00 · 620686fa46
commit 620686fa46
parent 54afbb7af5 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