Fixes parts of #44:

- accounting menu: group order amounts (see posting above)
- group order result (of a closed or settled order)
- manage order menu: sorted in articles / sorted in groups

app/assets/javascripts/application.js

@@ -112,6 +112,9 @@ $(function() {
         // trigger timeout to submit form when value was changed
         clearTimeout(input.data('submit-timeout-id'));
         input.data('submit-timeout-id', setTimeout(function() {
+          if (input.data('multiply-before-submit')) {
+            input.parents('form').append(`<input type="hidden" name="${input.attr('name')}" value="${input.val() * input.data('multiply-before-submit')}" />`);
+          }
           if (input.val() != input.data('old-value')) input.parents('form').submit();
           input.removeData('submit-timeout-id');
           input.removeData('old-value');

app/helpers/articles_helper.rb

@@ -15,45 +15,55 @@ def row_classes(article)
     classes.join(" ")
   end
 
-  def format_supplier_article_unit(article)
-    return ArticleUnit.as_hash[article.supplier_order_unit][:name] unless article.supplier_order_unit.nil?
+  def format_unit(unit_property, article)
+    unit_code = article.send(unit_property)
+    return article.unit if unit_code.nil?
 
-    article.unit
-  end
-
-  def format_group_order_unit(article)
-    return article.unit if article.group_order_unit.nil?
-
-    unit = ArticleUnitsLib.units.to_h[article.group_order_unit]
+    unit = ArticleUnitsLib.units.to_h[unit_code]
     unit[:symbol] || unit[:name]
   end
 
-  def format_supplier_order_unit_with_ratios(article)
-    base = format_supplier_article_unit(article)
-    return base if ArticleUnitsLib.unit_is_si_convertible(article.supplier_order_unit)
+  def format_supplier_order_unit(article)
+    format_unit(:supplier_order_unit, article)
+  end
 
-    first_si_convertible_unit = article.article_unit_ratios.map(&:unit)
-                                       .find { |unit| ArticleUnitsLib.unit_is_si_convertible(unit) }
-    return base if first_si_convertible_unit.nil?
+  def format_group_order_unit(article)
+    format_unit(:group_order_unit, article)
+  end
 
-    quantity = article.convert_quantity(1, article.supplier_order_unit, first_si_convertible_unit)
-    "#{base} (#{format_number(quantity)}\u00a0#{ArticleUnitsLib.units.to_h[first_si_convertible_unit][:symbol]})"
+  def format_billing_unit(article)
+    format_unit(:billing_unit, article)
   end
 
-  def format_group_order_unit_with_ratios(article)
-    base = format_group_order_unit(article)
-    return base if ArticleUnitsLib.unit_is_si_convertible(article.group_order_unit)
+  def format_unit_with_ratios(unit_property, article)
+    base = format_unit(unit_property, article)
+    unit_code = article.send(unit_property)
+    return base if ArticleUnitsLib.unit_is_si_convertible(unit_code)
 
-    first_si_convertible_unit = [article.article_unit_ratios.map(&:unit), article.supplier_order_unit]
+    relevant_units = [article.article_unit_ratios.map(&:unit)]
+    relevant_units << article.supplier_order_unit unless unit_property == :supplier_order_unit
+    first_si_convertible_unit = relevant_units
                                 .flatten
                                 .find { |unit| ArticleUnitsLib.unit_is_si_convertible(unit) }
 
     return base if first_si_convertible_unit.nil?
 
-    quantity = article.convert_quantity(1, article.group_order_unit, first_si_convertible_unit)
+    quantity = article.convert_quantity(1, unit_code, first_si_convertible_unit)
     "#{base} (#{format_number(quantity)}\u00a0#{ArticleUnitsLib.units.to_h[first_si_convertible_unit][:symbol]})"
   end
 
+  def format_supplier_order_unit_with_ratios(article)
+    format_unit_with_ratios(:supplier_order_unit, article)
+  end
+
+  def format_group_order_unit_with_ratios(article)
+    format_unit_with_ratios(:group_order_unit, article)
+  end
+
+  def format_billing_unit_with_ratios(article)
+    format_unit_with_ratios(:billing_unit, article)
+  end
+
   def field_with_preset_value_and_errors(options)
     form, field, value, field_errors, input_html = options.values_at(:form, :field, :value, :errors, :input_html)
     form.input field, label: false, wrapper_html: { class: field_errors.blank? ? '' : 'error' }, input_html: input_html do

app/helpers/group_order_articles_helper.rb

@@ -1,14 +1,18 @@
 module GroupOrderArticlesHelper
   # return an edit field for a GroupOrderArticle result
-  def group_order_article_edit_result(goa)
+  def group_order_article_edit_result(goa, convert_to_billing_unit = true)
     result = number_with_precision goa.result, strip_insignificant_zeros: true
     unless goa.group_order.order.finished? && current_user.role_finance?
       result
     else
+      order_article = goa.order_article
+      article_version = order_article.article_version
       simple_form_for goa, remote: true, html: { 'data-submit-onchange' => 'changed', class: 'delta-input' } do |f|
-        order_article = goa.order_article
-        quantity_data = ratio_quantity_data(order_article, order_article.article_version.group_order_unit)
-        f.input_field :result, as: :delta, class: 'input-nano', data: { min: 0 }.merge(quantity_data), id: "r_#{goa.id}", value: result
+        quantity_data = ratio_quantity_data(order_article, order_article.article_version.billing_unit)
+        converted_value = convert_to_billing_unit ? article_version.convert_quantity(goa.result, article_version.group_order_unit, article_version.billing_unit) : result
+        input_data = { min: 0 }.merge(quantity_data)
+        input_data = input_data.merge('multiply-before-submit': article_version.convert_quantity(1, article_version.billing_unit, article_version.group_order_unit)) if convert_to_billing_unit
+        f.input_field(:result, as: :delta, class: 'input-nano', data: input_data, id: "r_#{goa.id}", value: converted_value)
       end
     end
   end

app/models/concerns/price_calculation.rb

@@ -42,6 +42,7 @@ def convert_quantity(quantity, input_unit, output_unit)
 
   def group_order_price(value = nil)
     value ||= price
+    # price is always stored in supplier_order_unit:
     value / convert_quantity(1, supplier_order_unit, group_order_unit)
   end
 

app/views/deliveries/_stock_article_for_adding.html.haml

@@ -5,7 +5,7 @@
 %tr{:id => "stock_article_#{article.id}", :class => css_class}
   %td= article.name
   %td{:data => {:toggle => :tooltip, :title => "#{render(:partial => 'shared/article_version_info', :locals => {:article => article})}"}}= number_to_currency article.price
-  %td= format_supplier_article_unit(article)
+  %td= format_supplier_order_unit(article)
   %td= article.article_category.name
   %td
     = link_to t('.action_edit'), edit_stock_article_path(article), remote: true, class: 'btn btn-mini'

app/views/deliveries/_stock_change_fields.html.haml

@@ -5,6 +5,6 @@
     %span.stock_article_name= stock_change.stock_article.name
     = f.association :stock_article, :as => :hidden
   %td.price{:data => {:toggle => :tooltip, :title => "#{render(:partial => 'shared/article_version_info', :locals => {:article => stock_article})}"}}= number_to_currency stock_article.price
-  %td.unit= format_supplier_article_unit(stock_change.stock_article)
+  %td.unit= format_supplier_order_unit(stock_change.stock_article)
   %td= f.input :quantity, :wrapper => :intable, :input_html => {:class => 'stock-change-quantity', :autocomplete => :off}
   %td= stock_change_remove_link f

app/views/deliveries/add_stock_change.js.erb

@@ -5,7 +5,7 @@
 
   $('#stock_changes tr').removeClass('success');
 
-  var quantity = w.prompt('<%= j(t('.how_many_units', :unit => format_supplier_article_unit(@stock_change.stock_article), :name => @stock_change.stock_article.name)) %>');
+  var quantity = w.prompt('<%= j(t('.how_many_units', :unit => format_supplier_order_unit(@stock_change.stock_article), :name => @stock_change.stock_article.name)) %>');
   if(null === quantity) {
     return false;
   }

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

@@ -26,7 +26,8 @@
               = link_to t('ui.delete'), group_order_article_path(group_order_article),
                 method: :delete, remote: true, class: 'btn btn-mini btn-danger'
           %td
-        - totals[:result] += group_order_article.result
+        - article_version = order_article.article_version
+        - totals[:result] += article_version.convert_quantity(group_order_article.result, article_version.group_order_unit, article_version.billing_unit)
     %tfoot
       %tr
         %td

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

@@ -6,7 +6,7 @@
   = pkg_helper(order_article.article_version, unit: order_article.article_version.billing_unit)
   - if s=ordered_quantities_different_from_group_orders?(order_article)
     %span{:style => "color:red;font-weight: bold"}= s
-%td #{format_group_order_unit_with_ratios(order_article.article_version)}
+%td #{format_billing_unit_with_ratios(order_article.article_version)}
 %td
   = number_to_currency(order_article.article_version.price, :unit => "")
   :plain

app/views/shared/articles_by/_article_single_goa.html.haml

@@ -1,5 +1,5 @@
 %tr{class: if goa.result == 0 then 'unavailable' end, id: "goa_#{goa.id}"}
   %td{:style => "width:70%"}= goa.group_order.ordergroup_name
   %td.center= "#{goa.quantity} + #{goa.tolerance}"
-  %td.center.input-delta= group_order_article_edit_result(goa)
+  %td.center.input-delta= group_order_article_edit_result(goa, false)
   %td.price{data: {value: goa.total_price}}= number_to_currency(goa.total_price)

app/views/stockit/_stock_article.html.haml

@@ -3,7 +3,7 @@
   %td= stock_article.quantity
   %td= stock_article.quantity_ordered
   %td.main_info= stock_article.quantity_available
-  %td= format_supplier_article_unit(stock_article)
+  %td= format_supplier_order_unit(stock_article)
   %td= stock_article.price
   %td= number_to_percentage stock_article.tax
   %td= link_to stock_article.supplier.name, stock_article.supplier