#
# This file is part of Koha.
#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
-# this script makes the items, addorder.pl has already made the biblio and biblioitem records: MASON
-
-use strict;
+use Modern::Perl;
+use CGI qw ( -utf8 );
+use C4::Auth;
use C4::Output;
+use C4::Context;
use C4::Acquisition;
use C4::Biblio;
-use CGI;
+use C4::Items;
use C4::Search;
-use C4::Circulation::Circ2;
-use C4::Reserves2;
-use C4::Interface::CGI::Output;
-use C4::Auth;
-use HTML::Template;
-
-#use Data::Dumper;
-
-my $input = new CGI;
-my $dbh = C4::Context->dbh;
-
-my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
- {
- template_name => "acqui/finishreceive.tmpl",
- query => $input,
- type => "intranet",
- authnotrequired => 0,
- flagsrequired => { editcatalogue => 1 },
- debug => 1,
- }
-);
-
-my $user = $input->remote_user;
-my $biblionumber = $input->param('biblio');
-my $biblioitemnumber = $input->param('biblioitemnum');
-my $ordnum = $input->param('ordnum');
-my $cost = $input->param('cost');
-my $invoiceno = $input->param('invoice');
-my $replacement = $input->param('rrp');
-my $gst = $input->param('gst');
-my $freight = $input->param('freight');
-my $freightperitem = $input->param('freightperitem');
-my $supplierid = $input->param('supplierid');
-my $title = $input->param('title');
-my $author = $input->param('author');
-my $copyrightdate = $input->param('copyrightdate');
-my $itemtype = $input->param('format');
-my $isbn = $input->param('ISBN');
-my $seriestitle = $input->param('series');
-my $branch = $input->param('branch');
-my $holdingbranch = $branch;
-my $barcode = $input->param('barcode');
-my $bookfund = $input->param('bookfund');
-my $quantity = $input->param('quantity');
-my $quantrec = $input->param('quantityrec');
-my $ecost = $input->param('ecost');
-my $unitprice = $input->param('unitprice');
-my $notes = $input->param('notes');
-my $booksellers = $input->param('booksellers');
-my $foo = $input->param('foo');
-my $volinf = $input->param('volinf');
-my $catview = $input->param('catview'); # for editing from moredetail.tmpl
-my $barcodeexists = $input->param('barcodeexists'); # if barcode exists
-my $newitemfailed = $input->param('newitemfailed'); # if create new item failed
-my $createbibitem =
- $input->param('createbibitem'); # user wants to create a new bibitem
-#get additional info on bib and bibitem from dbase for additional needed fields before modbiblio.
-( my $bibliocount, my @biblios ) = &getbiblio($biblionumber);
-( my $biblioitemcount, my @biblioitems ) =
- &getbiblioitembybiblionumber($biblionumber);
-( my $itemscount, my @items ) = &getitemsbybiblioitem($biblioitemnumber);
+use Koha::Number::Price;
+use Koha::Acquisition::Booksellers;
+use Koha::Acquisition::Orders;
-my $bibliohash = {
- biblionumber => $biblionumber,
- title => $title,
- author => $author,
- abstract => $biblios[0]->{'abstract'},
- copyrightdate => $copyrightdate,
- seriestitle => $seriestitle,
- serial => $biblios[0]->{'serial'},
- unititle => $biblios[0]->{'unititle'},
- notes => $biblios[0]->{'notes'}
-};
+use List::MoreUtils qw/any/;
-my $biblioitemhash = {
- illus => $biblioitems[0]->{'illus'},
- number => $biblioitems[0]->{'number'},
- itemtype => $itemtype,
- place => $biblioitems[0]->{'place'},
- biblioitemnumber => $biblioitemnumber,
- issn => $biblioitems[0]->{'issn'},
- size => $biblioitems[0]->{'size'},
- marc => $biblioitems[0]->{'marc'},
- timestamp => $biblioitems[0]->{'timestamp'},
- biblionumber => $biblionumber,
- url => $biblioitems[0]->{'url'},
- dewey => $biblioitems[0]->{'dewey'},
- isbn => $isbn,
- publishercode => $biblioitems[0]->{'publishercode'},
- lccn => $biblioitems[0]->{'iccn'},
- volume => $biblioitems[0]->{'volume'},
- subclass => $biblioitems[0]->{'subclass'},
- notes => $biblioitems[0]->{'notes'},
- classification => $biblioitems[0]->{'classification'},
- volumeddesc => $volinf,
- publicationyear => $biblioitems[0]->{'publicationyear'},
- volumedate => $biblioitems[0]->{'volumedate'},
- pages => $biblioitems[0]->{'pages'}
-};
+my $input=new CGI;
+my $flagsrequired = {acquisition => 'order_receive'};
-my $itemhash = {
- biblionumber => $biblionumber,
- itemnum => $items[0]->{'itemnumber'},
- barcode => $barcode,
- notes => $items[0]->{'notes'},
- itemcallnumber => $items[0]->{'itemcallnumber'},
- notforloan => $items[0]->{'notforloan'},
- location => $items[0]->{'location'},
- bibitemnum => $biblioitemnumber,
- homebranch => $items[0]->{'homebranch'},
- lost => $items[0]->{'itemlost'},
- withdrawn => $items[0]->{'withdrawn'},
- holdingbranch => $items[0]->{'holdingbranch'},
- replacement => $replacement
-};
+checkauth($input, 0, $flagsrequired, 'intranet');
-# check if barcode exists, if so redirect back to acquire.pl and give message
-my $error = &checkitems( 1, $barcode );
-#warn "barcode check for $barcode result = $error";
-if ($error) {
- print $input->redirect(
- "/cgi-bin/koha/acqui/acquire.pl?recieve=$ordnum&biblio=$biblionumber&invoice=$invoiceno&supplierid=$supplierid&freight=$freight&gst=$gst&barcodeexists=$barcode"
- );
-}
-# or if barcode is blank
-else {
-
- if ( $createbibitem eq "YES" ) {
- &modbiblio($bibliohash);
- $biblioitemnumber = &newbiblioitem($biblioitemhash);
-
-#lets do a lookup on aqorders, with ordnum, then insert biblioitem fiels with new biblioitem number
-
- my $query =
- "UPDATE aqorders SET biblioitemnumber = ? where ordernumber = ?
- and biblionumber = ?";
- my $sth = $dbh->prepare($query);
- my $error = $sth->execute( $biblioitemnumber, $ordnum, $biblionumber );
- #warn Dumper $error;
- $sth->fetchrow_hashref;
- $sth->finish;
- }
- else {
- &modbiblio($bibliohash);
- &modbibitem($biblioitemhash);
- }
-
- if ($catview) {
- &moditem($itemhash);
- print $input->redirect(
-"/cgi-bin/koha/moredetail.pl?type=$itemtype&bib=$biblionumber&bi=$biblioitemnumber"
- );
+my $user = $input->remote_user;
+my $biblionumber = $input->param('biblionumber');
+my $ordernumber = $input->param('ordernumber');
+my $origquantityrec = $input->param('origquantityrec');
+my $quantityrec = $input->param('quantityrec');
+my $quantity = $input->param('quantity');
+my $unitprice = $input->param('unitprice');
+my $replacementprice = $input->param('replacementprice');
+my $datereceived = $input->param('datereceived'),
+my $invoiceid = $input->param('invoiceid');
+my $invoice = GetInvoice($invoiceid);
+my $invoiceno = $invoice->{invoicenumber};
+my $booksellerid = $input->param('booksellerid');
+my $cnt = 0;
+my $bookfund = $input->param("bookfund");
+my $order = GetOrder($ordernumber);
+my $new_ordernumber = $ordernumber;
+
+$unitprice = Koha::Number::Price->new( $unitprice )->unformat();
+$replacementprice = Koha::Number::Price->new( $replacementprice )->unformat();
+warn "Replacement $replacementprice";
+my $basket = Koha::Acquisition::Orders->find( $ordernumber )->basket;
+
+#need old receivedate if we update the order, parcel.pl only shows the right parcel this way FIXME
+if ($quantityrec > $origquantityrec ) {
+ my @received_items = ();
+ if ($basket->effective_create_items eq 'ordering') {
+ @received_items = $input->param('items_to_receive');
+ my @affects = split q{\|}, C4::Context->preference("AcqItemSetSubfieldsWhenReceived");
+ if ( @affects ) {
+ my $frameworkcode = GetFrameworkCode($biblionumber);
+ my ( $itemfield ) = GetMarcFromKohaField( 'items.itemnumber', $frameworkcode );
+ for my $in ( @received_items ) {
+ my $item = C4::Items::GetMarcItem( $biblionumber, $in );
+ for my $affect ( @affects ) {
+ my ( $sf, $v ) = split q{=}, $affect, 2;
+ foreach ( $item->field($itemfield) ) {
+ $_->update( $sf => $v );
+ }
+ }
+ C4::Items::ModItemFromMarc( $item, $biblionumber, $in );
+ }
+ }
}
- if ( $quantity != 0 ) {
- # save the quantity recieved.
- receiveorder( $biblionumber, $ordnum, $quantrec, $user, $cost,
- $invoiceno, $freightperitem, $bookfund, $replacement );
+ $order->{order_internalnote} = $input->param("order_internalnote");
+ $order->{tax_rate_on_receiving} = $input->param("tax_rate");
+ $order->{replacementprice} = $replacementprice;
+ $order->{unitprice} = $unitprice;
- # create items if the user has entered barcodes
- my @barcodes = split( /\,| |\|/, $barcode ); #WTF?
+ $order = C4::Acquisition::populate_order_with_prices(
+ {
+ order => $order,
+ booksellerid => $booksellerid,
+ receiving => 1
+ }
+ );
- my ($error) = newitems(
+ # save the quantity received.
+ if ( $quantityrec > 0 ) {
+ ( $datereceived, $new_ordernumber ) = ModReceiveOrder(
{
- biblioitemnumber => $biblioitemnumber,
biblionumber => $biblionumber,
- replacementprice => $replacement,
- price => $cost,
- booksellerid => $supplierid,
- homebranch => $branch,
- loan => 0
- },
- @barcodes
+ order => $order,
+ quantityreceived => $quantityrec,
+ user => $user,
+ invoice => $invoice,
+ budget_id => $bookfund,
+ received_items => \@received_items,
+ }
);
+ }
- if ($error)
- { #if newitems failes then display error, and send them back to acquire.pl????
-
- print $input->redirect(
- "/cgi-bin/koha/acqui/acquire.pl?recieve=$ordnum&biblio=$biblionumber&invoice=$invoiceno&supplierid=$supplierid&freight=$freight&gst=$gst&newitemfailed=1"
- );
- }
-
- elsif ( $itemtype ne 'P' && $itemtype ne 'PP' ) { # chris's new if bit
- my %env;
- my $item = getiteminformation( \%env, 0, $barcode );
- my ( $resfound, $resrec ) = CheckReserves( 0, $barcode );
-
- if ($resfound) { # reserves is found
- my ($borrower) =
- getpatroninformation( \%env, $resrec->{'borrowernumber'}, 0 );
- $template->param(
- borrowernumber => $borrower->{'borrowernumber'},
- cardnumber => $borrower->{'cardnumber'},
- firstname => $borrower->{'firstname'},
- surname => $borrower->{'surname'},
- invoice => $invoiceno,
- id => $supplierid,
- freight => $freight,
- gst => $gst,
- items => $quantity,
- ordnum => $ordnum,
- biblionumber => $biblionumber,
- barcode => $barcode,
- );
-
- output_html_with_http_headers $input, $cookie,
- $template->output;
- }
- else { #no reserves found
- $invoiceno =~
- s/\&/\%26/g; # swapping pesky & with url friendly hex codes.
- print $input->redirect(
- "/cgi-bin/koha/acqui/receive.pl?invoice=$invoiceno&supplierid=$supplierid&freight=$freight&gst=$gst&quantity=$quantity"
- );
+ # now, add items if applicable
+ if ($basket->effective_create_items eq 'receiving') {
+
+ my @tags = $input->multi_param('tag');
+ my @subfields = $input->multi_param('subfield');
+ my @field_values = $input->multi_param('field_value');
+ my @serials = $input->multi_param('serial');
+ my @itemid = $input->multi_param('itemid');
+ my @ind_tag = $input->multi_param('ind_tag');
+ my @indicator = $input->multi_param('indicator');
+ #Rebuilding ALL the data for items into a hash
+ # parting them on $itemid.
+ my %itemhash;
+ my $countdistinct;
+ my $range=scalar(@itemid);
+ for (my $i=0; $i<$range; $i++){
+ unless ($itemhash{$itemid[$i]}){
+ $countdistinct++;
}
+ push @{$itemhash{$itemid[$i]}->{'tags'}},$tags[$i];
+ push @{$itemhash{$itemid[$i]}->{'subfields'}},$subfields[$i];
+ push @{$itemhash{$itemid[$i]}->{'field_values'}},$field_values[$i];
+ push @{$itemhash{$itemid[$i]}->{'ind_tag'}},$ind_tag[$i];
+ push @{$itemhash{$itemid[$i]}->{'indicator'}},$indicator[$i];
+ }
+ my $new_order = Koha::Acquisition::Orders->find( $new_ordernumber );
+ foreach my $item (keys %itemhash){
+ my $xml = TransformHtmlToXml( $itemhash{$item}->{'tags'},
+ $itemhash{$item}->{'subfields'},
+ $itemhash{$item}->{'field_values'},
+ $itemhash{$item}->{'indicator'},
+ $itemhash{$item}->{'ind_tag'},
+ 'ITEM' );
+ my $record=MARC::Record::new_from_xml($xml, 'UTF-8');
+ my (undef,$bibitemnum,$itemnumber) = AddItemFromMarc($record,$biblionumber);
+ $new_order->add_item( $itemnumber );
}
- else {
- print $input->redirect(
- "/cgi-bin/koha/loadmodules.pl?module=acquisitions")
- ; # chris's new bit
- } # end of if
- }
- else {
-
- # print $input->header;
- delorder( $biblionumber, $ordnum );
- print $input->redirect("/acquisitions/");
}
}
+
+ModItem(
+ {
+ booksellerid => $booksellerid,
+ dateaccessioned => $datereceived,
+ datelastseen => $datereceived,
+ price => $unitprice,
+ replacementprice => $replacementprice,
+ replacementpricedate => $datereceived,
+ },
+ $biblionumber,
+ $_
+) foreach GetItemnumbersFromOrder($new_ordernumber);
+
+print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid&sticky_filters=1");
projects / koha.git / blobdiff