This commit is contained in:
wvengen 2013-11-25 15:24:20 +01:00
parent 9c340ec08e
commit 9990e059d4
3 changed files with 12 additions and 3 deletions

View File

@ -18,7 +18,7 @@ class Finance::ReceiveController < Finance::BaseController
end
end
flash[:notice] = I18n.t('receive.update.notice')
flash[:notice] = I18n.t('finance.receive.update.notice')
redirect_to finance_order_index_path
end
end

View File

@ -1,8 +1,8 @@
= fields_for 'order_articles', order_article, index: order_article.id do |form|
%tr{class: "#{cycle('even', 'odd', name: 'articles')} order-article", valign: "top"}
- order_title = []
- order_title.append t('.manufacturer')+': ' + order_article.article.manufacturer unless order_article.article.manufacturer.to_s.empty?
- order_title.append t('.note')+': ' + order_article.article.note unless order_article.article.note.to_s.empty?
- order_title.append Article.human_attribute_name(:manufacturer)+': ' + order_article.article.manufacturer unless order_article.article.manufacturer.to_s.empty?
- order_title.append Article.human_attribute_name(:note)+': ' + order_article.article.note unless order_article.article.note.to_s.empty?
- units_expected = (order_article.units_billed or order_article.units_to_order)
%td= order_article.article.order_number
%td.name{title: order_title.join("\n")}= order_article.article.name

View File

@ -662,6 +662,15 @@ en:
contact: Contact
name: Name
new_transaction: New transaction
receive:
add_article:
notice: Article "%{name}" was added to the order.
edit:
submit: Receive order
edit_articles:
add_article: Add article
update:
notice: Updated received article amounts for order
update:
notice: Invoice was updated
foodcoop: