allow to edit GroupOrderArticle result from orders screen

Conflicts:
	app/assets/javascripts/application.js

config/locales/en.yml

@@ -600,10 +600,6 @@ en:
       ordergroup:
         remove: Remove
         remove_group: Remove group
-    group_order_articles:
-      form:
-        amount_change_for: Change amount for %{article}
-        result_hint: ! 'Unit: %{unit}'
     index:
       amount_fc: Amount(FC)
       end: End
@@ -737,6 +733,10 @@ en:
       error_general: The order couldn’t be updated due to a bug.
       error_stale: Someone else has ordered in the meantime, couldn't update the order.
       notice: The order was saved.
+  group_order_articles:
+    form:
+      amount_change_for: Change amount for %{article}
+      result_hint: ! 'Unit: %{unit}'
   helpers:
     application:
       edit_user: Edit user
@@ -1294,14 +1294,9 @@ en:
       ordered_desc: Number of articles as ordered by member (amount + tolerance)
       received: Received
       received_desc: Number of articles that (will be) received by member
-    articles_by_articles:
-      ordergroup: Ordergroup
-      price: Total price
-    articles_by_groups:
+    articles_by:
       price: Total price
       price_sum: Sum
-      unit_quantity: Lot quantity
-      unit_quantity_desc: How many units per lot.
     group:
       access: Access to
       activated: activated

config/routes.rb

@@ -53,6 +53,8 @@ Foodsoft::Application.routes.draw do
       get :archive, :on => :collection
     end
 
+    resources :group_order_articles
+
     resources :order_comments, :only => [:new, :create]
 
     ############ Foodcoop orga
@@ -155,12 +157,6 @@ Foodsoft::Application.routes.draw do
         end
       end
 
-      resources :group_order_articles do
-        member do
-          put :update_result
-        end
-      end
-
       resources :invoices
 
       resources :ordergroups, :only => [:index] do