merged in the version 1.5 from the main branch
This commit is contained in:
parent
1bc41981d1
commit
b3ccb7948d
|
|
@ -14,14 +14,13 @@ my $input=new CGI;
|
|||
|
||||
my $user=$input->remote_user;
|
||||
#print $input->dump;
|
||||
my $biblio=$input->param('biblio');
|
||||
my $biblionumber = $input->param('biblio');
|
||||
my $ordnum=$input->param('ordnum');
|
||||
my $quantrec=$input->param('quantityrec');
|
||||
my $quantity=$input->param('quantity');
|
||||
my $notes=$input->param('notes');
|
||||
my $cost=$input->param('cost');
|
||||
my $invoiceno=$input->param('invoice');
|
||||
my $id=$input->param('id');
|
||||
my $bibitemno=$input->param('biblioitemnum');
|
||||
my $data=bibitemdata($bibitemno);
|
||||
my $publisher=$data->{'publishercode'};
|
||||
|
|
@ -38,12 +37,15 @@ my $branch=$input->param('branch');
|
|||
my $bookfund=$input->param('bookfund');
|
||||
my $itemtype=$input->param('format');
|
||||
my $isbn=$input->param('ISBN');
|
||||
my $series=$input->param('Series');
|
||||
my $bookseller=$input->param('bookseller');
|
||||
$id=$bookseller;
|
||||
my $title=$input->param('title');
|
||||
my $author=$input->param('author');
|
||||
my $copyright=$input->param('copyright');
|
||||
my $bookseller = $input->param('bookseller');
|
||||
my $id = $bookseller;
|
||||
my $biblio = {
|
||||
biblionumber => $biblionumber,
|
||||
title => $input->param('title')?$input->param('title'):"",
|
||||
author => $input->param('author')?$input->param('author'):"",
|
||||
copyrightdate => $input->param('copyright')?$input->param('copyright'):"",
|
||||
series => $input->param('Series')?$input->param('Series'):""
|
||||
}; # my $biblio
|
||||
|
||||
if ($quantrec != 0){
|
||||
$cost=$cost / $quantrec;
|
||||
|
|
@ -60,14 +62,32 @@ if ($itemtype =~ /REF/){
|
|||
if ($itemtype =~ /PER/){
|
||||
# print "$bibitemno";
|
||||
$class="Periodical";
|
||||
$bibitemno=newbiblioitem($biblio,$itemtype,$isbn,$volinf,$class);
|
||||
$bibitemno = &newbiblioitem({
|
||||
biblionumber => $biblionumber,
|
||||
itemtype => $itemtype?$itemtype:"",
|
||||
isbn => $isbn?$isbn:"",
|
||||
volumeddesc => $volinf?$volinf:"",
|
||||
classification => $class?$class:"" });
|
||||
# print "here $bibitemno";
|
||||
}
|
||||
if ($quantity != 0){
|
||||
receiveorder($biblio,$ordnum,$quantrec,$user,$cost,$invoiceno,$bibitemno,$freight,$bookfund);
|
||||
modbiblio($biblio,$title,$author,$copyright,$series);
|
||||
modbibitem($bibitemno,$itemtype,$isbn,$publisher,$pubdate,$class,$dewey,$subclass,$illus,$pages,$volinf,$notes,$size);
|
||||
#print $notes;
|
||||
receiveorder($biblionumber,$ordnum,$quantrec,$user,$cost,$invoiceno,$bibitemno,$freight,$bookfund);
|
||||
modbiblio($biblio);
|
||||
&modbibitem({
|
||||
biblioitemnumber => $bibitemno,
|
||||
itemtype => $itemtype?$itemtype:"",
|
||||
isbn => $isbn?$isbn:"",
|
||||
publisher => $publisher?$publisher:"",
|
||||
publicationyear => $pubdate?$pubdate:"",
|
||||
class => $class?$class:"",
|
||||
dewey => $dewey?$dewey:"",
|
||||
subclass => $subclass?$subclass:"",
|
||||
illus => $illus?$illus:"",
|
||||
pages => $pages?$pages:"",
|
||||
volumeddesc => $volinf?$volinf:"",
|
||||
notes => $notes?$notes:"",
|
||||
size => $size?$size:"" });
|
||||
|
||||
my $barcode=$input->param('barcode');
|
||||
my @barcodes;
|
||||
if ($barcode =~ /\,/){
|
||||
|
|
@ -80,7 +100,15 @@ if ($quantity != 0){
|
|||
# print @barcodes;
|
||||
# print $barcode;
|
||||
}
|
||||
my ($error)=makeitems($quantrec,$bibitemno,$biblio,$replacement,$cost,$bookseller,$branch,$loan,@barcodes);
|
||||
my ($error) = newitems({ biblioitemnumber => $bibitemno,
|
||||
biblionumber => $biblionumber,
|
||||
replacementprice => $replacement,
|
||||
price => $cost,
|
||||
booksellerid => $bookseller,
|
||||
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");
|
||||
|
|
@ -93,6 +121,6 @@ if ($quantity != 0){
|
|||
}
|
||||
} else {
|
||||
print $input->header;
|
||||
delorder($biblio,$ordnum);
|
||||
delorder($biblionumber,$ordnum);
|
||||
print $input->redirect("/acquisitions/");
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue