migrate to Rails 4.0 (closes foodcoops#214)

Conflicts: Gemfile.lock
2014-02-20 15:04:53 +01:00 · 2014-02-20 15:04:53 +01:00 · 7841245795
commit 7841245795
parent 12d1221bfc
97 changed files with 659 additions and 557 deletions
--- a/app/documents/order_fax.rb
+++ b/app/documents/order_fax.rb
@ -58,7 +58,7 @@ class OrderFax < OrderPdf
    # Articles
    total = 0
    data = [I18n.t('documents.order_fax.rows')]
-    data += @order.order_articles.ordered.all(include: :article).collect do |a|
+    data += @order.order_articles.ordered.includes(:article).collect do |a|
      subtotal = a.units_to_order * a.price.unit_quantity * a.price.price
      total += subtotal
      [a.article.order_number,