From e0c0834690f49be6fac0152ac843e5c9a7b92714 Mon Sep 17 00:00:00 2001 From: Patrick Gansterer Date: Mon, 8 Feb 2021 01:05:29 +0100 Subject: [PATCH] Show stockorder in PDFs When generating a PDF, which contains a order from a supplier and stock, we want show that some articles are from stock instead of showing the original supplier, since the people want to know where to look for their products during pickup. --- app/documents/order_by_articles.rb | 2 +- app/documents/order_by_groups.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/documents/order_by_articles.rb b/app/documents/order_by_articles.rb index cf80462b..fabfcb9e 100644 --- a/app/documents/order_by_articles.rb +++ b/app/documents/order_by_articles.rb @@ -30,7 +30,7 @@ class OrderByArticles < OrderPdf next unless rows.length > 1 name = "#{order_article.article.name} (#{order_article.article.unit} | #{order_article.price.unit_quantity} | #{number_to_currency(order_article.price.fc_price)})" - name += " #{order_article.article.supplier.name}" if @options[:show_supplier] + name += " #{order_article.order.name}" if @options[:show_supplier] nice_table name, rows, dimrows do |table| table.column(0).width = bounds.width / 2 table.columns(1..-1).align = :right diff --git a/app/documents/order_by_groups.rb b/app/documents/order_by_groups.rb index e726440c..c953578b 100644 --- a/app/documents/order_by_groups.rb +++ b/app/documents/order_by_groups.rb @@ -25,7 +25,7 @@ class OrderByGroups < OrderPdf each_group_order_article_for_ordergroup(oa_id) do |goa| dimrows << rows.length if goa.result == 0 rows << [goa.order_article.article.name, - goa.order_article.article.supplier.name, + goa.group_order.order.name, group_order_article_quantity_with_tolerance(goa), group_order_article_result(goa), order_article_price_per_unit(goa.order_article),