Bug 8892 fix Plack scoping in acquisition
basket.pl has a local sub get_order_infos that require our-ing the basketno variable. Note that I had no problem with this variable. It may be some dead code, but I couldn't be sure it is, so I just switched basketno to "our" neworderempty.pl has 2 local sub that require our-ing some variables: subs MARCfindbreeding and Load_Duplicate Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
This commit is contained in:
parent
bc9c8c4124
commit
702aa83952
2 changed files with 8 additions and 8 deletions
|
@ -65,7 +65,7 @@ the supplier this script have to display the basket.
|
|||
=cut
|
||||
|
||||
my $query = new CGI;
|
||||
my $basketno = $query->param('basketno');
|
||||
our $basketno = $query->param('basketno');
|
||||
my $booksellerid = $query->param('booksellerid');
|
||||
|
||||
my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
|
||||
|
|
|
@ -91,7 +91,7 @@ use C4::Search qw/FindDuplicate/;
|
|||
#needed for z3950 import:
|
||||
use C4::ImportBatch qw/GetImportRecordMarc SetImportRecordStatus/;
|
||||
|
||||
my $input = new CGI;
|
||||
our $input = new CGI;
|
||||
my $booksellerid = $input->param('booksellerid'); # FIXME: else ERROR!
|
||||
my $budget_id = $input->param('budget_id') || 0;
|
||||
my $title = $input->param('title');
|
||||
|
@ -99,8 +99,8 @@ my $author = $input->param('author');
|
|||
my $publicationyear = $input->param('publicationyear');
|
||||
my $bookseller = GetBookSellerFromId($booksellerid); # FIXME: else ERROR!
|
||||
my $ordernumber = $input->param('ordernumber') || '';
|
||||
my $biblionumber = $input->param('biblionumber');
|
||||
my $basketno = $input->param('basketno');
|
||||
our $biblionumber = $input->param('biblionumber');
|
||||
our $basketno = $input->param('basketno');
|
||||
my $suggestionid = $input->param('suggestionid');
|
||||
my $close = $input->param('close');
|
||||
my $uncertainprice = $input->param('uncertainprice');
|
||||
|
@ -110,7 +110,7 @@ my $new = 'no';
|
|||
|
||||
my $budget_name;
|
||||
|
||||
my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
|
||||
our ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
|
||||
{
|
||||
template_name => "acqui/neworderempty.tmpl",
|
||||
query => $input,
|
||||
|
@ -121,18 +121,18 @@ my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
|
|||
}
|
||||
);
|
||||
|
||||
my $marcflavour = C4::Context->preference('marcflavour');
|
||||
our $marcflavour = C4::Context->preference('marcflavour');
|
||||
|
||||
if(!$basketno) {
|
||||
my $order = GetOrder($ordernumber);
|
||||
$basketno = $order->{'basketno'};
|
||||
}
|
||||
|
||||
my $basket = GetBasket($basketno);
|
||||
our $basket = GetBasket($basketno);
|
||||
my $contract = &GetContract($basket->{contractnumber});
|
||||
|
||||
#simple parameters reading (all in one :-)
|
||||
my $params = $input->Vars;
|
||||
our $params = $input->Vars;
|
||||
my $listprice=0; # the price, that can be in MARC record if we have one
|
||||
if ( $ordernumber eq '' and defined $params->{'breedingid'}){
|
||||
#we want to import from the breeding reservoir (from a z3950 search)
|
||||
|
|
Loading…
Reference in a new issue