Merge latest changes in master

2013-06-17 15:47:08 +02:00 · 2013-06-17 15:47:08 +02:00 · 9502ca28dd
commit 9502ca28dd
parent a9938df443 f47237ebe0
11 changed files with 220 additions and 202 deletions
--- a/app/models/order.rb
+++ b/app/models/order.rb
@ -33,7 +33,7 @@ class Order < ActiveRecord::Base
  end

  def name
-    stockit? ? "Lager" : supplier.name
+    stockit? ? I18n.t('orders.model.stock') : supplier.name
  end

  def articles_for_ordering