Introduced group_order_article.result to save the result for each group/article.

app/views/orders/_form.html.haml

@@ -31,7 +31,7 @@
           %option{:value => "-1", :selected => "selected"}=_ "Choose an order..."
           - i = -1
           - for order in @template_orders
-            %option{:value => (i += 1)}=h order.supplier.name
+            %option{:value => (i += 1)}= "#{h(order.supplier.name)} bis #{order.ends.strftime('%d. %b')}"
     %table.list
       %tr
         %th= check_box_tag 'checkall', "1", false, { :onclick => "checkUncheckAll(this)" }
@@ -41,11 +41,11 @@
         %th=_ "Manufacturer"
         %th=_ "Unit quantity"
         %th=_ "Price"
-      - for category, articles in Article.group_by_category(@order.supplier.getArticlesAvailableForOrdering)
+      - for category_name, articles in @order.supplier.get_articles_for_ordering
         %tr{:style => "background-color:#EFEFEF"}
           %td
           %td{:colspan => "6", :style => "text-align:left"}
-            %b=h category
+            %b=h category_name
         - for article in articles
           / check if the article is selected
           - included = @order.order_articles.detect { |order_article| order_article.article_id == article.id }