Merge pull request #240 from foodcoop-rostock/fix-order-article-helper-undeleted

Offer _undeleted_ StockArticles for new OrderArticle only
2014-01-08 04:42:55 -08:00 · 2014-01-08 04:42:55 -08:00 · 0e8e93204a
parent 69a29b8296 3819fa012e
commit 0e8e93204a
1 changed files with 2 additions and 2 deletions
--- a/app/helpers/finance/order_articles_helper.rb
+++ b/app/helpers/finance/order_articles_helper.rb
@ -2,9 +2,9 @@ module Finance::OrderArticlesHelper

  def new_order_articles_collection
    if @order.stockit?
-      StockArticle.order('articles.name')
+      StockArticle.undeleted.reorder('articles.name')
    else
-      @order.supplier.articles.undeleted.order('articles.name')
+      @order.supplier.articles.undeleted.reorder('articles.name')
    end
  end
 end