From d25530e168b5d1c3a79bc51c9d8c16aae15cae1a Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Fri, 6 Jan 2017 13:36:35 +0100 Subject: [PATCH] Bug 17736: [QA Follow-up] Script basket.pl is not Plack compliant Content-Type: text/plain; charset=utf-8 Several warnings like: Variable "$confirm_pref" is not available at /usr/share/koha/masterclone/acqui/basket.pl line 507. Primarily caused by sub edi_close_and_order. Easy fix. Signed-off-by: Marcel de Rooy --- acqui/basket.pl | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/acqui/basket.pl b/acqui/basket.pl index a9be23e..a05e552 100755 --- a/acqui/basket.pl +++ b/acqui/basket.pl @@ -69,13 +69,13 @@ the supplier this script have to display the basket. =cut -my $query = new CGI; +our $query = new CGI; our $basketno = $query->param('basketno'); -my $ean = $query->param('ean'); -my $booksellerid = $query->param('booksellerid'); +our $ean = $query->param('ean'); +our $booksellerid = $query->param('booksellerid'); my $duplinbatch = $query->param('duplinbatch'); -my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user( +our ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user( { template_name => "acqui/basket.tt", query => $query, @@ -86,7 +86,7 @@ my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user( } ); -my $basket = GetBasket($basketno); +our $basket = GetBasket($basketno); $booksellerid = $basket->{booksellerid} unless $booksellerid; my $bookseller = Koha::Acquisition::Booksellers->find( $booksellerid ); my $schema = Koha::Database->new()->schema(); @@ -112,7 +112,7 @@ unless (CanUserManageBasket($loggedinuser, $basket, $userflags)) { # warn "=>".$basket->{booksellerid}; my $op = $query->param('op') // 'list'; -my $confirm_pref= C4::Context->preference("BasketConfirmations") || '1'; +our $confirm_pref= C4::Context->preference("BasketConfirmations") || '1'; $template->param( skip_confirm_reopen => 1) if $confirm_pref eq '2'; my @messages; @@ -466,6 +466,7 @@ sub get_order_infos { my $holds_count = $biblio ? $biblio->holds->count : 0; my @items = GetItemnumbersFromOrder( $ordernumber ); my $itemholds = $biblio ? $biblio->holds->search({ itemnumber => { -in => \@items } })->count : 0; +warn "L469 $holds_count $itemholds"; # if the biblio is not in other orders and if there is no items elsewhere and no subscriptions and no holds we can then show the link "Delete order and Biblio" see bug 5680 $line{can_del_bib} = 1 if $countbiblio <= 1 && $itemcount == scalar @items && !(@subscriptions) && !($holds_count); -- 2.1.4