X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=acqui%2Faddorder.pl;h=279084b797e865987702fee32ae300a371111f1b;hb=367c4fb8815bfe4a01869a25bcd8222989c15dcd;hp=1bd80a17cdcf367c78fa8d3884377a7ff3ceabff;hpb=4b089e1eee51629b807d768f04c0d327460c4c3b;p=koha_gimpoz diff --git a/acqui/addorder.pl b/acqui/addorder.pl index 1bd80a17cd..279084b797 100755 --- a/acqui/addorder.pl +++ b/acqui/addorder.pl @@ -16,9 +16,9 @@ # 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, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. =head1 NAME @@ -30,19 +30,23 @@ addorder.pl this script allows to add an order. It is called by : +=over + =item neworderbiblio.pl to add an order from nothing. =item neworderempty.pl to add an order from an existing biblio. =item newordersuggestion.pl to add an order from an existing suggestion. +=back + =head1 CGI PARAMETERS All of the cgi parameters below are related to the new order. -=over 4 +=over -=item C +=item C the number of this new order. =item C @@ -73,6 +77,9 @@ the quantity to order. =item C the price of this order. +=item C +uncertain price, can't close basket until prices of all orders are known. + =item C the branch where this order will be received. @@ -81,8 +88,8 @@ the branch where this order will be received. =item C Notes on this basket. -=item C -bookfund use to pay this order. +=item C +budget_id used to pay this order. =item C & C @@ -113,18 +120,22 @@ if it is an order from an existing suggestion : the id of this suggestion. =cut use strict; +use warnings; use CGI; -use C4::Auth; -use C4::Acquisition; -use C4::Suggestions; -use C4::Biblio; +use C4::Auth; # get_template_and_user +use C4::Acquisition; # NewOrder DelOrder ModOrder +use C4::Suggestions; # ModStatus +use C4::Biblio; # AddBiblio TransformKohaToMarc +use C4::Items; use C4::Output; +### "-------------------- addorder.pl ----------" - -#use Date::Manip; +# FIXME: This needs to do actual error checking and possibly return user to the same form, +# not just blindly call C4 functions and print a redirect. my $input = new CGI; +### $input # get_template_and_user used only to check auth & get user id my ( $template, $loggedinuser, $cookie ) = get_template_and_user( @@ -133,99 +144,143 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( query => $input, type => "intranet", authnotrequired => 0, - flagsrequired => { acquisition => 1 }, + flagsrequired => { acquisition => 'order_manage' }, debug => 1, } ); # get CGI parameters -my $ordnum = $input->param('ordnum'); -my $basketno = $input->param('basketno'); -my $booksellerid = $input->param('booksellerid'); -my $existing = $input->param('existing'); # existing biblio, (not basket or order) -my $title = $input->param('title'); -my $author = $input->param('author'); -my $copyrightdate = $input->param('copyrightdate'); -my $isbn = $input->param('ISBN'); -my $itemtype = $input->param('format'); -my $quantity = $input->param('quantity'); -my $listprice = $input->param('list_price'); -my $branch = $input->param('branch'); -if ( $listprice eq '' ) { - $listprice = 0; -} -my $series = $input->param('series'); -my $notes = $input->param('notes'); -my $bookfund = $input->param('bookfund'); -my $sort1 = $input->param('sort1'); -my $sort2 = $input->param('sort2'); -my $rrp = $input->param('rrp'); -my $ecost = $input->param('ecost'); -my $gst = $input->param('GST'); -my $budget = $input->param('budget'); -my $cost = $input->param('cost'); -my $sub = $input->param('sub'); -my $purchaseorder = $input->param('purchaseordernumber'); -my $invoice = $input->param('invoice'); -my $publishercode = $input->param('publishercode'); -my $suggestionid = $input->param('suggestionid'); +my $orderinfo = $input->Vars; +$orderinfo->{'list_price'} ||= 0; +$orderinfo->{'uncertainprice'} ||= 0; +#my $ordernumber = $input->param('ordernumber'); +#my $basketno = $input->param('basketno'); +#my $booksellerid = $input->param('booksellerid'); +#my $existing = $input->param('existing'); # existing biblio, (not basket or order) +#my $title = $input->param('title'); +#my $author = $input->param('author'); +#my $publicationyear= $input->param('publicationyear'); +#my $isbn = $input->param('ISBN'); +#my $itemtype = $input->param('format'); +#my $quantity = $input->param('quantity'); # FIXME: else ERROR! +#my $branch = $input->param('branch'); +#my $series = $input->param('series'); +#my $notes = $input->param('notes'); +#my $budget_id = $input->param('budget_id'); +#my $sort1 = $input->param('sort1'); +#my $sort2 = $input->param('sort2'); +#my $rrp = $input->param('rrp'); +#my $ecost = $input->param('ecost'); +#my $gst = $input->param('GST'); +#my $budget = $input->param('budget'); +#my $cost = $input->param('cost'); +#my $sub = $input->param('sub'); +#my $purchaseorder = $input->param('purchaseordernumber'); +#my $invoice = $input->param('invoice'); +#my $publishercode = $input->param('publishercode'); +#my $suggestionid = $input->param('suggestionid'); +#my $biblionumber = $input->param('biblionumber'); +#my $uncertainprice = $input->param('uncertainprice'); +#my $import_batch_id= $input->param('import_batch_id'); +# +#my $createbibitem = $input->param('createbibitem'); +# my $user = $input->remote_user; - -#warn "CREATEBIBITEM = $input->param('createbibitem')"; -#warn Dumper $input->param('createbibitem'); -my $createbibitem = $input->param('createbibitem'); - # create, modify or delete biblio # create if $quantity>=0 and $existing='no' # modify if $quantity>=0 and $existing='yes' -# delete if $quantity has been se to 0 by the librarian -my $biblionumber=$input->param('biblionumber'); +# delete if $quantity has been set to 0 by the librarian +# delete biblio if delbiblio has been set to 1 by the librarian my $bibitemnum; -if ( $quantity ne '0' ) { - #check to see if biblio exists - if ( $existing eq 'no' ) { - +if ( $orderinfo->{quantity} ne '0' ) { + #TODO:check to see if biblio exists + unless ( $$orderinfo{biblionumber} ) { #if it doesnt create it my $record = TransformKohaToMarc( { - "biblio.title" => "$title", - "biblio.author" => "$author", - "biblio.copyrightdate" => $copyrightdate ? $copyrightdate : "", - "biblio.series" => $series ? $series : "", - "biblioitems.itemtype" => $itemtype ? $itemtype : "", - "biblioitems.isbn" => $isbn ? $isbn : "", - "biblioitems.publishercode" => $publishercode ? $publishercode : "", + "biblio.title" => "$$orderinfo{title}", + "biblio.author" => $$orderinfo{author} ? $$orderinfo{author} : "", + "biblio.seriestitle" => $$orderinfo{series} ? $$orderinfo{series} : "", + "biblioitems.isbn" => $$orderinfo{isbn} ? $$orderinfo{isbn} : "", + "biblioitems.publishercode" => $$orderinfo{publishercode} ? $$orderinfo{publishercode} : "", + "biblioitems.publicationyear" => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "", + "biblio.copyrightdate" => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "", + "biblioitems.itemtype" => $$orderinfo{itemtype} ? $$orderinfo{itemtype} : "", + "biblioitems.editionstatement"=> $$orderinfo{editionstatement} ? $$orderinfo{editionstatement} : "", }); - # create the record in catalogue, with framework '' - ($biblionumber,$bibitemnum) = AddBiblio($record,''); + # create the record in catalogue, with framework '' + my ($biblionumber,$bibitemnum) = AddBiblio($record,''); # change suggestion status if applicable - if ($suggestionid) { - ModStatus( $suggestionid, 'ORDERED', '', $biblionumber ); + if ($$orderinfo{suggestionid}) { + ModSuggestion( {suggestionid=>$$orderinfo{suggestionid}, STATUS=>'ORDERED', biblionumber=>$biblionumber} ); } + $orderinfo->{biblioitemnumber}=$bibitemnum; + $orderinfo->{biblionumber}=$biblionumber; } - # if we already have $ordnum, then it's an ordermodif - if ($ordnum) { - ModOrder( - $title, $ordnum, $quantity, $listprice, - $biblionumber, $basketno, $booksellerid, $loggedinuser, - $notes, $bookfund, $bibitemnum, $rrp, - $ecost, $gst, $budget, $cost, - $invoice, $sort1, $sort2, $purchaseorder - ); + + # if we already have $ordernumber, then it's an ordermodif + if ($$orderinfo{ordernumber}) { + ModOrder( $orderinfo); } else { # else, it's a new line - ( $basketno, $ordnum ) = NewOrder( - $basketno, $biblionumber, $title, $quantity, - $listprice, $booksellerid, $loggedinuser, $notes, - $bookfund, $bibitemnum, $rrp, $ecost, - $gst, $budget, $cost, $sub, - $invoice, $sort1, $sort2, $purchaseorder - ); + @$orderinfo{qw(basketno ordernumber )} = NewOrder($orderinfo); } + + # now, add items if applicable + if (C4::Context->preference('AcqCreateItem') eq 'ordering') { + + my @tags = $input->param('tag'); + my @subfields = $input->param('subfield'); + my @field_values = $input->param('field_value'); + my @serials = $input->param('serial'); + my @itemid = $input->param('itemid'); + my @ind_tag = $input->param('ind_tag'); + my @indicator = $input->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]; + } + foreach my $item (keys %itemhash){ + + my $xml = TransformHtmlToXml( $itemhash{$item}->{'tags'}, + $itemhash{$item}->{'subfields'}, + $itemhash{$item}->{'field_values'}, + $itemhash{$item}->{'ind_tag'}, + $itemhash{$item}->{'indicator'}, + 'ITEM'); + my $record=MARC::Record::new_from_xml($xml, 'UTF-8'); + my ($biblionumber,$bibitemnum,$itemnumber) = AddItemFromMarc($record,$$orderinfo{biblionumber}); + NewOrderItem($itemnumber, $$orderinfo{ordernumber}); + + } + } + } + else { # qty=0, delete the line - $biblionumber = $input->param('biblionumber'); - DelOrder( $biblionumber, $ordnum ); + my $biblionumber = $input->param('biblionumber'); + DelOrder( $biblionumber, $$orderinfo{ordernumber} ); + if ($orderinfo->{delbiblio} == 1){ + DelBiblio($biblionumber); + } +} +my $basketno=$$orderinfo{basketno}; +my $booksellerid=$$orderinfo{booksellerid}; +if (my $import_batch_id=$$orderinfo{import_batch_id}) { + print $input->redirect("/cgi-bin/koha/acqui/addorderiso2709.pl?import_batch_id=$import_batch_id&basketno=$basketno&booksellerid=$booksellerid"); +} else { + print $input->redirect("/cgi-bin/koha/acqui/basket.pl?basketno=$basketno"); } -print $input->redirect("basket.pl?basketno=$basketno");