Bug 25507: Fix table in basket group PDF German 2-pages
authorKatrin Fischer <katrin.fischer.83@web.de>
Fri, 22 May 2020 23:22:53 +0000 (01:22 +0200)
committerVictor Grousset/tuxayo <victor@tuxayo.net>
Fri, 19 Jun 2020 04:43:30 +0000 (06:43 +0200)
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 <david@davidnind.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 7de78ab092f7355a15de60e9a2842d9577777581)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 7acffaa03f690a2104afbfeaa3cc12277670db04)

Signed-off-by: Aleisha Amohia <aleishaamohia@hotmail.com>

(cherry picked from commit 4b0600e9efd13b76fecdc4fd0e99f9abbd7d48fb)
Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>

Koha/pdfformat/layout2pagesde.pm

index aeee17b..94f520c 100644 (file)
@@ -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 . '%',