diff --git a/app/views/order_articles/_edit.html.haml b/app/views/order_articles/_edit.html.haml index bd19221e..d1394aa4 100644 --- a/app/views/order_articles/_edit.html.haml +++ b/app/views/order_articles/_edit.html.haml @@ -9,7 +9,8 @@ .fold-line = form.input :units_to_order, hint: '', input_html: {class: 'input-nano'} -#= form.input :units_billed, label: 'invoice', input_html: {class: 'input-nano'} - = form.input :units_received, input_html: {class: 'input-nano'} + = form.input :units_received, input_html: {class: 'input-nano'}, + label: t('activerecord.attributes.order_article.units_received_short') %p.help-block= t 'simple_form.hints.order_article.units_to_order' .foo{style: 'clear:both'} diff --git a/app/views/orders/_edit_amounts.html.haml b/app/views/orders/_edit_amounts.html.haml index 25ebdcde..1470ca92 100644 --- a/app/views/orders/_edit_amounts.html.haml +++ b/app/views/orders/_edit_amounts.html.haml @@ -73,8 +73,8 @@ %th.default-sort.sort{:data => {:sort => 'string'}}= heading_helper Article, :name %th= heading_helper Article, :unit %th= heading_helper Article, :price - %th= heading_helper OrderArticle, :units_to_order, short: true %th= heading_helper OrderArticle, :quantity, short: true + %th= heading_helper OrderArticle, :units_to_order, short: true -#%th Invoice # TODO implement invoice screen %th= heading_helper OrderArticle, :units_received, short: true %th diff --git a/config/locales/en.yml b/config/locales/en.yml index 1ce8bf4b..2bfb46a2 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -84,9 +84,9 @@ en: missing_units_short: Missing quantity: Desired amount quantity_short: Desired - units_received: Received amount of units + units_received: Received units units_received_short: Received - units_to_order: Ordered amount of units + units_to_order: Ordered units units_to_order_short: Ordered update_current_price: Globally update current price order_comment: