View | Details | Raw Unified | Return to bug 8892
Collapse All | Expand All

(-)a/acqui/basket.pl (-1 / +1 lines)
Lines 65-71 the supplier this script have to display the basket. Link Here
65
=cut
65
=cut
66
66
67
my $query        = new CGI;
67
my $query        = new CGI;
68
my $basketno     = $query->param('basketno');
68
our $basketno     = $query->param('basketno');
69
my $booksellerid = $query->param('booksellerid');
69
my $booksellerid = $query->param('booksellerid');
70
70
71
my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
71
my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
(-)a/acqui/neworderempty.pl (-8 / +7 lines)
Lines 91-97 use C4::Search qw/FindDuplicate/; Link Here
91
#needed for z3950 import:
91
#needed for z3950 import:
92
use C4::ImportBatch qw/GetImportRecordMarc SetImportRecordStatus/;
92
use C4::ImportBatch qw/GetImportRecordMarc SetImportRecordStatus/;
93
93
94
my $input           = new CGI;
94
our $input           = new CGI;
95
my $booksellerid    = $input->param('booksellerid');	# FIXME: else ERROR!
95
my $booksellerid    = $input->param('booksellerid');	# FIXME: else ERROR!
96
my $budget_id       = $input->param('budget_id') || 0;
96
my $budget_id       = $input->param('budget_id') || 0;
97
my $title           = $input->param('title');
97
my $title           = $input->param('title');
Lines 99-106 my $author = $input->param('author'); Link Here
99
my $publicationyear = $input->param('publicationyear');
99
my $publicationyear = $input->param('publicationyear');
100
my $bookseller      = GetBookSellerFromId($booksellerid);	# FIXME: else ERROR!
100
my $bookseller      = GetBookSellerFromId($booksellerid);	# FIXME: else ERROR!
101
my $ordernumber          = $input->param('ordernumber') || '';
101
my $ordernumber          = $input->param('ordernumber') || '';
102
my $biblionumber    = $input->param('biblionumber');
102
our $biblionumber    = $input->param('biblionumber');
103
my $basketno        = $input->param('basketno');
103
our $basketno        = $input->param('basketno');
104
my $suggestionid    = $input->param('suggestionid');
104
my $suggestionid    = $input->param('suggestionid');
105
my $close           = $input->param('close');
105
my $close           = $input->param('close');
106
my $uncertainprice  = $input->param('uncertainprice');
106
my $uncertainprice  = $input->param('uncertainprice');
Lines 110-116 my $new = 'no'; Link Here
110
110
111
my $budget_name;
111
my $budget_name;
112
112
113
my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
113
our ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
114
    {
114
    {
115
        template_name   => "acqui/neworderempty.tmpl",
115
        template_name   => "acqui/neworderempty.tmpl",
116
        query           => $input,
116
        query           => $input,
Lines 121-138 my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user( Link Here
121
    }
121
    }
122
);
122
);
123
123
124
my $marcflavour = C4::Context->preference('marcflavour');
124
our $marcflavour = C4::Context->preference('marcflavour');
125
125
126
if(!$basketno) {
126
if(!$basketno) {
127
    my $order = GetOrder($ordernumber);
127
    my $order = GetOrder($ordernumber);
128
    $basketno = $order->{'basketno'};
128
    $basketno = $order->{'basketno'};
129
}
129
}
130
130
131
my $basket = GetBasket($basketno);
131
our $basket = GetBasket($basketno);
132
my $contract = &GetContract($basket->{contractnumber});
132
my $contract = &GetContract($basket->{contractnumber});
133
133
134
#simple parameters reading (all in one :-)
134
#simple parameters reading (all in one :-)
135
my $params = $input->Vars;
135
our $params = $input->Vars;
136
my $listprice=0; # the price, that can be in MARC record if we have one
136
my $listprice=0; # the price, that can be in MARC record if we have one
137
if ( $ordernumber eq '' and defined $params->{'breedingid'}){
137
if ( $ordernumber eq '' and defined $params->{'breedingid'}){
138
#we want to import from the breeding reservoir (from a z3950 search)
138
#we want to import from the breeding reservoir (from a z3950 search)
139
- 

Return to bug 8892