Continue I18n of receive screen

app/views/orders/_edit_amounts.html.haml

@@ -41,7 +41,7 @@
     
     function init_add_article(sel) {
       $(sel).removeAttr('disabled').select2({
-        placeholder: '#{j t('orders.add_article.title')}',
+        placeholder: '#{j t('orders.receive.add_article')}',
         formatNoMatches: function(term) { return '#{j t('.no_articles_available')}';}
         // TODO implement adding a new article, like in deliveries
       }).on('change', function(e) {
@@ -66,17 +66,17 @@
       $(this).replaceWith('<i class="icon icon-warning-sign add-on"></i>');
     }
 
-%table#order_articles.ordered-articles.table.table-striped.stupidtable
+%table#order_articles.ordered-articles.table.table-striped.stupidtable{style: 'margin-bottom: 0'}
   %thead
     %tr
       %th.sort{:data => {:sort => 'string'}}= heading_helper Article, :order_number, short: true
       %th.default-sort.sort{:data => {:sort => 'string'}}= heading_helper Article, :name
       %th= heading_helper Article, :unit
       %th= heading_helper Article, :price
-      %th Members
+      %th= t '.members' # TODO: find term for this
       %th Ordered
       -#%th Invoice # TODO implement invoice screen
-      %th Received
+      %th= heading_helper OrderArticle, :units_received
       %th
       %th= t 'ui.actions'
   %tfoot
@@ -85,6 +85,7 @@
         %select#add_article{:style => 'width: 500px;'}
           - new_article_data.each do |option|
             %option{id: "add_article_#{option[:id]}", value: option[:id]}= option[:text]
+
   %tbody#result_table
     - @order_articles.each do |order_article|
       = render :partial => 'edit_amount', :locals => {:order_article => order_article}

app/views/orders/receive.html.haml

@@ -22,24 +22,22 @@
       });
     });
 
-- title "Receiving #{@order.name}"
+- title t('.title', order: @order.name)
 
 = form_tag(receive_order_path(@order)) do
-  %section#results
+  %fieldset#results
     = render 'edit_amounts'
 
   .form-actions
     .pull-left
-      Surplus to
-      = label_tag :rest_to_tolerance, class: 'inline' do
+      %b.checkbox.inline
+        = t '.surplus_options'
+      = label_tag :rest_to_tolerance, class: 'checkbox inline' do
         = check_box_tag :rest_to_tolerance, 1, true
-        member tolerance,
-      %span{style: 'color: grey'}
-        and
-        = label_tag :rest_to_stock, class: 'inline' do
-          = check_box_tag :rest_to_stock, 1, false, disabled: true
-          stock
-
+        = t '.consider_member_tolerance'
+      = label_tag :rest_to_stock, class: 'checkbox inline' do
+        = check_box_tag :rest_to_stock, 1, false, disabled: true
+        %span{style: 'color: grey'}= t '.rest_to_stock'
     .pull-right
       = submit_tag t('.submit'), class: 'btn btn-primary'
       = link_to t('ui.or_cancel'), order_path(@order)