Merge branch 'master' into fresh-flow

Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less

app/views/finance/balancing/_edit_results_by_articles.html.haml

@@ -1,14 +1,14 @@
 %table.ordered-articles.table.table-striped
   %thead
     %tr
-      %th= sort_link_helper t('.article'), "name"
-      %th= sort_link_helper t('.number'), "order_number"
+      %th= sort_link_helper Article.model_name.human, "name"
+      %th= sort_link_helper Article.human_attribute_name(:order_number_short), "order_number"
       %th= t('.amount')
-      %th= t('.amount_per_unit')
+      %th= heading_helper Article, :units
       %th= t('.net')
       %th= t('.gross')
-      %th= t('.tax')
-      %th= t('.refund')
+      %th= heading_helper Article, :tax
+      %th= heading_helper Article, :deposit
       %th{:colspan => "2"}
         = link_to t('.add_article'), new_finance_order_order_article_path(@order), remote: true,
           class: 'btn btn-small'

app/views/finance/balancing/_group_order_articles.html.haml

@@ -3,7 +3,7 @@
     %thead
       %tr
         %td
-        %td{:style => "width:8em"}= t('.group')
+        %td{:style => "width:8em"}= Ordergroup.model_name.human
         %td= t('.units')
         %td= t('.total')
         %td{:colspan => "3",:style => "width:14em"}

app/views/finance/balancing/_order_article.html.haml

@@ -5,7 +5,7 @@
   = order_article.units_to_order
   - unless order_article.ordered_quantities_equal_to_group_orders?
     %span{:style => "color:red;font-weight: bold"} !
-%td= order_article.price.unit_quantity.to_s + ' * ' + order_article.article.unit.to_s
+%td #{order_article.price.unit_quantity} × #{order_article.article.unit}
 %td
   = number_to_currency(order_article.price.price, :unit => "")
   :plain
@@ -16,7 +16,7 @@
   :plain
     /
   = number_to_currency(order_article.total_gross_price, :unit => "")
-%td= order_article.price.tax
+%td #{order_article.price.tax}%
 %td= order_article.price.deposit
 %td
   = link_to t('ui.edit'), edit_finance_order_order_article_path(order_article.order, order_article), remote: true,

app/views/finance/financial_transactions/_transactions.html.haml

@@ -4,10 +4,10 @@
 %table.table.table-striped
   %thead
     %tr
-      %td= sort_link_helper t('.date'), "date"
-      %td= t('.who')
-      %td= sort_link_helper t('.note'), "note"
-      %td= sort_link_helper t('.amount'), "amount"
+      %th= sort_link_helper heading_helper(FinancialTransaction, :created_on), "date"
+      %th= heading_helper FinancialTransaction, :user
+      %th= sort_link_helper heading_helper(FinancialTransaction, :note), "note"
+      %th= sort_link_helper heading_helper(FinancialTransaction, :amount), "amount"
   %tbody
     - @financial_transactions.each do |t|
       %tr

app/views/finance/financial_transactions/new_collection.html.haml

@@ -21,13 +21,13 @@
 
 = form_tag finance_create_transaction_collection_path do
   %p
-    %b= t('.note')
+    %b= heading_helper FinancialTransaction, :note
     = text_field_tag :note, params[:note], class: 'input-xlarge', required: 'required'
   %p
     %table#ordergroups{:style => "width:20em"}
       %tr
-        %th= t('.ordergroup')
-        %th= t('.amount')
+        %th= heading_helper FinancialTransaction, :ordergroup
+        %th= heading_helper FinancialTransaction, :amount
       = render :partial => 'ordergroup', :collection => [1, 2, 3]
   %p
     = link_to t('.new_ordergroup'), '#', 'data-add-transaction' => true, class: 'btn'

app/views/finance/group_order_articles/_form.html.haml

@@ -5,7 +5,7 @@
     %h3= t('.amount_change_for', article: @order_article.article.name)
   .modal-body
     = form.input :ordergroup_id, as: :select, collection: Ordergroup.all.map { |g| [g.name, g.id] }
-    = form.input :result, hint: I18n.t('.result_hint', unit: @order_article.article.unit)
+    = form.input :result, hint: I18n.t('finance.group_order_articles.form.result_hint', unit: @order_article.article.unit) # Why do we need the full prefix?
   .modal-footer
     = link_to t('ui.close'), '#', class: 'btn', data: {dismiss: 'modal'}
     = form.submit t('ui.save'), class: 'btn btn-primary'

app/views/finance/index.html.haml

@@ -8,9 +8,9 @@
     %table.table.table-striped
       %thead
         %tr
-          %th= t('.date')
-          %th.numeric= t('.amount')
-          %th= t('.supplier')
+          %th= heading_helper Invoice, :date
+          %th.numeric= heading_helper Invoice, :amount
+          %th= heading_helper Invoice, :supplier
           %th
       %tbody
         - for invoice in @unpaid_invoices
@@ -26,10 +26,10 @@
     %table.table.table-striped
       %thead
         %tr
-          %th= t('.date')
-          %th= t('.group')
-          %th= t('.note')
-          %th.numeric= t('.amount')
+          %th= heading_helper FinancialTransaction, :created_on
+          %th= heading_helper FinancialTransaction, :ordergroup
+          %th= heading_helper FinancialTransaction, :note
+          %th.numeric= heading_helper FinancialTransaction, :amount
       %tbody
         - @financial_transactions.each do |ft|
           %tr
@@ -45,8 +45,8 @@
       %table.table.table-striped
         %thead
           %tr
-            %th= t('.supplier')
-            %th= t('.end')
+            %th= heading_helper Order, :name
+            %th= t '.end'
             %th.numeric= t('.amount_fc')
             %th 
         %tbody
@@ -55,6 +55,6 @@
               %td= order.name
               %td= format_date(order.ends)
               %td.numeric= number_to_currency(order.sum(:fc))
-              %td= link_to t('.clear'), new_finance_order_path(order_id: order.id), class: 'btn btn-mini'
+              %td= link_to t('finance.balancing.orders.clear'), new_finance_order_path(order_id: order.id), class: 'btn btn-mini'
     - else
       = t('.everything_cleared')

app/views/finance/invoices/_invoices.html.haml

@@ -23,7 +23,7 @@
         %td= format_date invoice.date
         %td= format_date invoice.paid_on
         %td= number_to_currency invoice.amount
-        %td= link_to t('.delivery'), [invoice.supplier,invoice.delivery] if invoice.delivery
+        %td= link_to Delivery.model_name.human, [invoice.supplier,invoice.delivery] if invoice.delivery
         %td= link_to format_date(invoice.order.ends), new_finance_order_path(order_id: invoice.order_id) if invoice.order
         %td= truncate(invoice.note)
         %td= link_to t('ui.edit'), edit_finance_invoice_path(invoice), class: 'btn btn-mini'

app/views/finance/order_articles/_new.html.haml

@@ -3,7 +3,7 @@
     = link_to t('ui.marks.close').html_safe, '#', class: 'close', data: {dismiss: 'modal'}
     %h3= t '.title'
   .modal-body
-    = form.input :article_id, as: :select, collection: new_order_articles_collection
+    = form.input :article_id, as: :select, collection: new_order_articles_collection, :label => Article.model_name.human # Why do we need the label?
   .modal-footer
     = link_to t('ui.close'), '#', class: 'btn', data: {dismiss: 'modal'}
     = form.submit class: 'btn btn-primary'

app/views/finance/ordergroups/_ordergroups.html.haml

@@ -4,9 +4,9 @@
 %table.table.table-striped
   %thead
     %tr
-      %th= sort_link_helper t('.name'), "name", :per_page => @per_page
-      %th= t '.contact'
-      %th.numeric= sort_link_helper t('.account_balance'), "account_balance", :per_page => @per_page
+      %th= sort_link_helper heading_helper(Ordergroup, :name), "name", :per_page => @per_page
+      %th= heading_helper Ordergroup, :contact
+      %th.numeric= sort_link_helper heading_helper(Ordergroup, :account_balance), "account_balance", :per_page => @per_page
       %th
   %tbody
     - for ordergroup in @ordergroups