# 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
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<ordnum>
+=item C<ordernumber>
the number of this new order.
=item C<basketno>
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => { acquisition => 'order_manage' },
+ 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'); # FIXME: else ERROR!
-my $listprice = $input->param('list_price') || 0;
-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 $user = $input->remote_user;
-my $uncertainprice = $input->param('uncertainprice');
-
-#warn "CREATEBIBITEM = $input->param('createbibitem')";
-#warn Dumper $input->param('createbibitem');
-my $createbibitem = $input->param('createbibitem');
+my $orderinfo = $input->Vars;
+$orderinfo->{'list_price'} ||= 0;
+$orderinfo->{'uncertainprice'} ||= 0;
+
+my $user = $input->remote_user;
# create, modify or delete biblio
# create if $quantity>=0 and $existing='no'
# modify if $quantity>=0 and $existing='yes'
# 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' ) {
+if ( $orderinfo->{quantity} ne '0' ) {
#TODO:check to see if biblio exists
- unless ( $biblionumber ) {
-
+ 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.ean" => $$orderinfo{ean} ? $$orderinfo{ean} : "",
+ "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} : "",
+ "aqorders.branchcode" => $$orderinfo{branchcode} ? $$orderinfo{branchcode} : "",
+ "aqorders.quantity" => $$orderinfo{quantity} ? $$orderinfo{quantity} : "",
+ "aqorders.listprice" => $$orderinfo{listprice} ? $$orderinfo{listprice} : "",
+ "aqorders.uncertainprice" => $$orderinfo{uncertainprice} ? $$orderinfo{uncertainprice} : "",
+ "aqorders.rrp" => $$orderinfo{rrp} ? $$orderinfo{rrp} : "",
+ "aqorders.ecost" => $$orderinfo{ecost} ? $$orderinfo{ecost} : "",
+ "aqorders.discount" => $$orderinfo{discount} ? $$orderinfo{discount} : "",
});
+
# create the record in catalogue, with framework ''
- ($biblionumber,$bibitemnum) = AddBiblio($record,'');
+ 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) {
- my %orderinfo = ("biblionumber", $biblionumber,
- "ordernumber", $ordnum,
- "basketno", $basketno,
- "quantity", $quantity,
- "listprice", $listprice,
- "notes", $notes,
- "biblioitemnumber", $bibitemnum,
- "rrp", $rrp,
- "ecost", $ecost,
- "gst", $gst,
- "unitprice", $cost,
- "subscription", $sub,
- "sort1", $sort1,
- "sort2", $sort2,
-# "budgetdate", $budget,
- "purchaseordernumber", $purchaseorder,
- "branchcode", $branch,
- "booksellerinvoicenumber", $invoice,
- "budget_id", $budget_id,
- "uncertainprice", $uncertainprice);
- ModOrder( \%orderinfo);
+ $orderinfo->{unitprice} = $orderinfo->{ecost} if not defined $orderinfo->{unitprice} or $orderinfo->{unitprice} eq '';
+
+ # if we already have $ordernumber, then it's an ordermodif
+ if ($$orderinfo{ordernumber}) {
+ ModOrder( $orderinfo);
}
else { # else, it's a new line
- my %orderinfo = ("biblionumber", $biblionumber,
- "ordernumber", $ordnum,
- "basketno", $basketno,
- "quantity", $quantity,
- "listprice", $listprice,
- "notes", $notes,
- "biblioitemnumber", $bibitemnum,
- "rrp", $rrp,
- "ecost", $ecost,
- "gst", $gst,
- "unitprice", $cost,
- "subscription", $sub,
- "sort1", $sort1,
- "sort2", $sort2,
-# "budgetdate", $budget,
- "purchaseordernumber", $purchaseorder,
- "branchcode", $branch,
- "booksellerinvoicenumber", $invoice,
- "budget_id", $budget_id,
- "uncertainprice", $uncertainprice);
- ( $basketno, $ordnum ) = NewOrder(\%orderinfo);
+ @$orderinfo{qw(basketno ordernumber )} = NewOrder($orderinfo);
}
# now, add items if applicable
$itemhash{$item}->{'subfields'},
$itemhash{$item}->{'field_values'},
$itemhash{$item}->{'ind_tag'},
- $itemhash{$item}->{'indicator'});
+ $itemhash{$item}->{'indicator'},
+ 'ITEM');
my $record=MARC::Record::new_from_xml($xml, 'UTF-8');
- my ($biblionumber,$bibitemnum,$itemnumber) = AddItemFromMarc($record,$biblionumber);
- NewOrderItem($itemnumber, $ordnum);
+ 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");
projects / koha_fer / blobdiff