Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Split up messages for stock/ supplier orders.

Browse source
This commit is contained in:
Robert Waltemath 2013-09-18 10:50:56 +02:00
parent e728e76729
commit 142de28ade
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/order.rb
View file

@ -229,7 +229,7 @@ class Order < ActiveRecord::Base
to_be_removed = order_articles - chosen_order_articles
to_be_removed_but_ordered = to_be_removed.select { |a| a.quantity > 0 or a.tolerance > 0 }
unless to_be_removed_but_ordered.empty? or ignore_warnings
errors.add(:articles, I18n.t('orders.model.warning_ordered'))
errors.add(:articles, I18n.t(stockit? ? 'orders.model.warning_ordered_stock' : 'orders.model.warning_ordered'))
@erroneous_article_ids = to_be_removed_but_ordered.map { |a| a.article_id }
end
end