diff --git a/app/controllers/finance/receive_controller.rb b/app/controllers/finance/receive_controller.rb index 2ecbd059..7bab88ca 100644 --- a/app/controllers/finance/receive_controller.rb +++ b/app/controllers/finance/receive_controller.rb @@ -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 diff --git a/app/views/finance/receive/_edit_article.html.haml b/app/views/finance/receive/_edit_article.html.haml index 96047a7d..9c96f80c 100644 --- a/app/views/finance/receive/_edit_article.html.haml +++ b/app/views/finance/receive/_edit_article.html.haml @@ -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 diff --git a/config/locales/en.yml b/config/locales/en.yml index efd2961e..db27433a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -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: