From 5bea72de4b943866b76a2a854692c5aa51ba902a Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sat, 23 May 2020 01:22:53 +0200 Subject: [PATCH] Bug 25507: Fix table in basket group PDF German 2-pages A variable was doubled up which made the columns in the table of orders no longer line up (different number of headers to columns). To test: - Create at least one basket with one or more orders - Close the basket - Add the basket to a basket group manually or let Koha do it on closing - Change the OrderPdfFormat system preference to 'German 2-page' - Go to the basket group page and print the PDF of the basket - Verify the table of orders doesn't look right and runs outside the page - Apply patch - Repeat the PDF print - now table should look right Signed-off-by: David Nind Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart (cherry picked from commit 7de78ab092f7355a15de60e9a2842d9577777581) Signed-off-by: Lucas Gass (cherry picked from commit 7acffaa03f690a2104afbfeaa3cc12277670db04) Signed-off-by: Aleisha Amohia (cherry picked from commit 4b0600e9efd13b76fecdc4fd0e99f9abbd7d48fb) Signed-off-by: Victor Grousset/tuxayo --- Koha/pdfformat/layout2pagesde.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Koha/pdfformat/layout2pagesde.pm b/Koha/pdfformat/layout2pagesde.pm index aeee17bd4a..94f520c919 100644 --- a/Koha/pdfformat/layout2pagesde.pm +++ b/Koha/pdfformat/layout2pagesde.pm @@ -92,7 +92,7 @@ sub printorders { } push( @$arrbasket, $basket->{basketno}, - $titleinfo. ($line->{order_vendornote} ? "\n----------------\nLieferantennotiz : ". $line->{order_vendornote} : '' ), $line->{quantity}, + $titleinfo. ($line->{order_vendornote} ? "\n----------------\nLieferantennotiz : ". $line->{order_vendornote} : '' ), $line->{quantity}, Koha::Number::Price->new( $line->{rrp_tax_included} )->format, Koha::Number::Price->new( $line->{discount} )->format . '%', -- 2.39.5