From 3c5e6c87a71e115f595ecc66937d23bdbdd79137 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Thu, 3 Nov 2011 00:44:36 +0100 Subject: [PATCH] [SIGNED-OFF] Bug 7138: Can't print basket group order pdf Content-Type: text/plain; charset="utf-8" PDF print of basket groups is broken. To test: 1) Make sure OrderPdfFormat is set to pdfformat::layout2pages or pdfformat::layout3pages 2) Create a basket with orders 3) Close the basket and create a basket group checking the checkbox 4) Print the basket group as PDF Before patch the file is broken and when opened in an editor contains an error message. After the patch the PDF should be generated correctly again. Thx to Chris for helping me to fix the problem. Signed-off-by: Chris Cormack Signed-off-by: Marcel de Rooy Combined require and import into use. Added a warn statement. --- acqui/basketgroup.pl | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/acqui/basketgroup.pl b/acqui/basketgroup.pl index fbcad0f..46d49d9 100755 --- a/acqui/basketgroup.pl +++ b/acqui/basketgroup.pl @@ -186,12 +186,8 @@ sub printbasketgrouppdf{ my $pdfformat = C4::Context->preference("OrderPdfFormat"); if ($pdfformat eq 'pdfformat::layout3pages' || $pdfformat eq 'pdfformat::layout2pages'){ - eval { - require $pdfformat; - import $pdfformat; - }; - if ($@){ - } + eval "use $pdfformat"; + warn "Error while loading pdfformat module: $@" if $@; } else { print $input->header; -- 1.6.0.6