[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha/acqui addorder.pl
From: |
Mason James |
Subject: |
[Koha-cvs] koha/acqui addorder.pl |
Date: |
Wed, 07 Jun 2006 19:14:06 +0000 |
CVSROOT: /sources/koha
Module name: koha
Changes by: Mason James <sushi> 06/06/07 19:14:06
Modified files:
acqui : addorder.pl
Log message:
perltidy before next commit.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/addorder.pl?cvsroot=koha&r1=1.26&r2=1.27
Patches:
Index: addorder.pl
===================================================================
RCS file: /sources/koha/koha/acqui/addorder.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- addorder.pl 6 Jan 2006 16:39:37 -0000 1.26
+++ addorder.pl 7 Jun 2006 19:14:06 -0000 1.27
@@ -3,7 +3,6 @@
#script to add an order into the system
#written 29/2/00 by address@hidden
-
# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
@@ -36,46 +35,51 @@
#use Date::Manip;
my $input = new CGI;
+
# get_template_and_user used only to check auth & get user id
-my ($template, $loggedinuser, $cookie)
- = get_template_and_user({template_name => "acqui/order.tmpl",
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ {
+ template_name => "acqui/order.tmpl",
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => {acquisition => 1},
+ flagsrequired => { acquisition => 1 },
debug => 1,
- });
+ }
+);
# get CGI parameters
-my $ordnum=$input->param('ordnum');
-my $basketno=$input->param('basketno');
+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');
-if ($listprice eq ''){
- $listprice=0;
+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');
+if ( $listprice eq '' ) {
+ $listprice = 0;
}
-my $series=$input->param('Series');
+my $series = $input->param('Series');
+
# my $supplier=$input->param('supplier');
-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 $invoice=$input->param('invoice');
+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 $invoice = $input->param('invoice');
my $publishercode = $input->param('publishercode');
-my $suggestionid= $input->param('suggestionid');
+my $suggestionid = $input->param('suggestionid');
# create, modify or delete biblio
# create if $quantity>=0 and $existing='no'
@@ -83,38 +87,64 @@
# delete if $quantity has been se to 0 by the librarian
my $bibnum;
my $bibitemnum;
-if ($quantity ne '0'){
+if ( $quantity ne '0' ) {
+
#check to see if biblio exists
- if ($existing eq 'no'){
+ if ( $existing eq 'no' ) {
+
#if it doesnt create it
- $bibnum = &newbiblio({ title => $title?$title:"",
- author => $author?$author:"",
- copyrightdate =>
$copyrightdate?$copyrightdate:"",
- series => $series?$series:"",
- });
- $bibitemnum = &newbiblioitem({ biblionumber => $bibnum,
- itemtype =>
$itemtype?$itemtype:"",
- isbn =>
$isbn?$isbn:"",
- publishercode
=> $publishercode?$publishercode:"",
- });
+ $bibnum = &newbiblio(
+ {
+ title => $title ? $title : "",
+ author => $author ? $author : "",
+ copyrightdate => $copyrightdate ? $copyrightdate : "",
+ series => $series ? $series : "",
+ }
+ );
+ $bibitemnum = &newbiblioitem(
+ {
+ biblionumber => $bibnum,
+ itemtype => $itemtype ? $itemtype : "",
+ isbn => $isbn ? $isbn : "",
+ publishercode => $publishercode ? $publishercode : "",
+ }
+ );
+
# change suggestion status if applicable
if ($suggestionid) {
- changestatus($suggestionid,'ORDERED','',$bibnum);
+ changestatus( $suggestionid, 'ORDERED', '', $bibnum );
+ }
}
- } else {
- $bibnum=$input->param('biblio');
- $bibitemnum=$input->param('bibitemnum');
- my $oldtype=$input->param('oldtype');
+ else {
+ $bibnum = $input->param('biblio');
+ $bibitemnum = $input->param('bibitemnum');
+ my $oldtype = $input->param('oldtype');
}
if ($ordnum) {
-# warn "MODORDER $title / $ordnum / $quantity / $bookfund";
-
modorder($title,$ordnum,$quantity,$listprice,$bibnum,$basketno,$booksellerid,$loggedinuser,$notes,$bookfund,$bibitemnum,$rrp,$ecost,$gst,$budget,$cost,$invoice,$sort1,$sort2);
- }else {
-# warn "new order : ";
-
$basketno=neworder($basketno,$bibnum,$title,$quantity,$listprice,$booksellerid,$loggedinuser,$notes,$bookfund,$bibitemnum,$rrp,$ecost,$gst,$budget,$cost,$sub,$invoice,$sort1,$sort2);
- }
-} else {
- $bibnum=$input->param('biblio');
- delorder($bibnum,$ordnum);
+
+ # warn "MODORDER $title / $ordnum / $quantity /
$bookfund";
+ modorder(
+ $title, $ordnum, $quantity, $listprice,
+ $bibnum, $basketno, $booksellerid, $loggedinuser,
+ $notes, $bookfund, $bibitemnum, $rrp,
+ $ecost, $gst, $budget, $cost,
+ $invoice, $sort1, $sort2
+ );
+ }
+ else {
+
+ # warn "new order : ";
+ $basketno = neworder(
+ $basketno, $bibnum, $title, $quantity,
+ $listprice, $booksellerid, $loggedinuser, $notes,
+ $bookfund, $bibitemnum, $rrp, $ecost,
+ $gst, $budget, $cost, $sub,
+ $invoice, $sort1, $sort2
+ );
+ }
+}
+else {
+ $bibnum = $input->param('biblio');
+ delorder( $bibnum, $ordnum );
}
print $input->redirect("basket.pl?basket=$basketno");
- [Koha-cvs] koha/acqui addorder.pl,
Mason James <=