my $biblio=$input->param('biblio');
my $catview=$input->param('catview');
my $gst=$input->param('gst');
-my ($count,@results)=ordersearch($search,$biblio,$catview);
+my ($count,@results)=ordersearch($search,$id,$biblio,$catview);
my ($count2,@booksellers)=bookseller($results[0]->{'booksellerid'});
my @date=split('-',$results[0]->{'entrydate'});
my $date="$date[2]/$date[1]/$date[0]";
for (my $i=0;$i<$count;$i++){
my %line;
$line{isbn} = $results[$i]->{'isbn'};
+ $line{basketno} = $results[$i]->{'basketno'};
+ $line{quantity} = $results[$i]->{'quantity'};
+ $line{quantityrecieved} = $results[$i]->{'quantityreceived'};
$line{ordernumber} = $results[$i]->{'ordernumber'};
$line{biblionumber} = $results[$i]->{'biblionumber'};
$line{invoice} = $invoice;
$line{gst} = $gst;
$line{title} = $results[$i]->{'title'};
$line{author} = $results[$i]->{'author'};
+ $line{id} = $id;
push @loop,\%line;
}
- $template->param( loop => \@loop);
+ $template->param( loop => \@loop,
+ user => $loggedinuser,
+ date => $date,
+ name => $booksellers[0]->{'name'},
+ id => $id,
+ invoice => $invoice,
+);
}
output_html_with_http_headers $input, $cookie, $template->output;
my $bookfund=$input->param('bookfund');
my $itemtype=$input->param('format');
my $isbn=$input->param('ISBN');
-my $bookseller = $input->param('bookseller');
-my $id = $bookseller;
my $biblio = {
biblionumber => $biblionumber,
title => $input->param('title')?$input->param('title'):"",
my $gst=$input->param('gst');
my $freight=$input->param('freight');
my $volinf=$input->param('volinf');
+my $id = $input->param('id');
my $loan=0;
if ($itemtype =~ /REF/){
$loan=1;
volumeddesc => $volinf?$volinf:"",
classification => $class?$class:"" });
}
-warn "qty : $quantity";
if ($quantity != 0){
+ warn "receive : $biblionumber,$ordnum,$quantrec,$user,$cost,$invoiceno,$bibitemno,$freight,$bookfund";
receiveorder($biblionumber,$ordnum,$quantrec,$user,$cost,$invoiceno,$bibitemno,$freight,$bookfund);
modbiblio($biblio);
&modbibitem({
biblionumber => $biblionumber,
replacementprice => $replacement,
price => $cost,
- booksellerid => $bookseller,
+ booksellerid => $id,
homebranch => $branch,
loan => $loan },
@barcodes);
if ($error eq ''){
- if ($itemtype ne 'PER'){
- print $input->redirect("/cgi-bin/koha/acqui/receive.pl?invoice=$invoiceno&id=$id&freight=$freight&gst=$gst");
- } else {
- print $input->redirect("/acquisitions/");
- }
+ if ($itemtype ne 'PER'){
+ print $input->redirect("/cgi-bin/koha/acqui/receive.pl?invoice=$invoiceno&id=$id&freight=$freight&gst=$gst");
+ } else {
+ print $input->redirect("/acquisitions/");
+ }
} else {
print $input->header;
print $error;
my $invoice=$input->param('invoice');
my $freight=$input->param('freight');
my $gst=$input->param('gst');
-my $user=$input->remote_user;
my $date=localtime(time);
my ($template, $loggedinuser, $cookie)
my $toggle;
my @loop_orders = ();
for (my$i=0;$i<$count;$i++){
- warn "nb : ".$results[$i]->{'ordernumber'};
$total=($results[$i]->{'unitprice'} + $results[$i]->{'freight'}) * $results[$i]->{'quantityreceived'};
$results[$i]->{'unitprice'}+=0;
my %line;
$tototal=$tototal+$freight;
$template->param(invoice => $invoice,
- user => $user,
+ user => $loggedinuser,
date => $date,
name => $booksellers[0]->{'name'},
+ id => $id,
gst => $gst,
freight => $freight,
invoice => $invoice,