use C4::Auth;
use C4::Bookfund;
-use C4::Bookseller;
+use C4::Bookseller; # GetBookSellerFromId
use C4::Acquisition;
-use C4::Suggestions;
-use C4::Biblio;
+use C4::Suggestions; # GetSuggestion
+use C4::Biblio; # GetBiblioData
use C4::Output;
use C4::Input;
use C4::Koha;
-use C4::Branch; # GetBranches
+use C4::Branch; # GetBranches
use C4::Members;
my $input = new CGI;
-my $booksellerid = $input->param('booksellerid');
+my $booksellerid = $input->param('booksellerid'); # FIXME: else ERROR!
my $title = $input->param('title');
my $author = $input->param('author');
my $copyright = $input->param('copyright');
-my @booksellers = GetBookSeller($booksellerid);
-my $count = scalar @booksellers;
+my $bookseller = GetBookSellerFromId($booksellerid); # FIXME: else ERROR!
my $ordnum = $input->param('ordnum');
-my $biblionumber = $input->param('biblionumber');
+my $biblionumber = $input->param('biblionumber');
my $basketno = $input->param('basketno');
+my $purchaseorder= $input->param('purchaseordernumber');
my $suggestionid = $input->param('suggestionid');
# my $donation = $input->param('donation');
my $close = $input->param('close');
my $data;
my $new;
-my $dbh = C4::Context->dbh;
if ( $ordnum eq '' ) { # create order
$new = 'yes';
# get suggestion fields if applicable. If it's a subscription renewal, then the biblio already exists
# otherwise, retrieve suggestion information.
if ($suggestionid) {
- if ($biblionumber) {
- $data = GetBiblioData($biblionumber);
- }
- else {
- $data = GetSuggestion($suggestionid);
- }
+ $data = ($biblionumber) ? GetBiblioData($biblionumber) : GetSuggestion($suggestionid);
}
}
else { #modify order
$data = GetOrder($ordnum);
$biblionumber = $data->{'biblionumber'};
- #get basketno and suppleirno. too!
+ #get basketno and supplierno. too!
my $data2 = GetBasket( $data->{'basketno'} );
$basketno = $data2->{'basketno'};
$booksellerid = $data2->{'booksellerid'};
# get currencies (for change rates calcs if needed)
my @rates = GetCurrencies();
-$count = scalar @rates;
+my $count = scalar @rates;
my @loop_currency = ();
for ( my $i = 0 ; $i < $count ; $i++ ) {
my $itemtypes = GetItemTypes;
my @itemtypesloop;
-my %itemtypesloop;
-foreach my $thisitemtype (sort keys %$itemtypes) {
- push @itemtypesloop, $itemtypes->{$thisitemtype}->{'itemtype'};
- $itemtypesloop{$itemtypes->{$thisitemtype}->{'itemtype'}} = $itemtypes->{$thisitemtype}->{'description'};
+foreach my $thisitemtype (sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'}} keys %$itemtypes) {
+ push @itemtypesloop, { itemtype => $itemtypes->{$thisitemtype}->{'itemtype'} , desc => $itemtypes->{$thisitemtype}->{'description'} } ;
}
-my $CGIitemtype = CGI::scrolling_list(
- -name => 'format',
- -values => \@itemtypesloop,
- -default => $data->{'itemtype'},
- -labels => \%itemtypesloop,
- -size => 1,
- -tabindex=>'',
- -multiple => 0
-);
-
# build branches list
my $onlymine=C4::Context->preference('IndependantBranches') &&
C4::Context->userenv &&
C4::Context->userenv->{branch};
my $branches = GetBranches($onlymine);
my @branchloop;
-foreach my $thisbranch ( sort keys %$branches ) {
+foreach my $thisbranch ( sort {$branches->{$a}->{'branchname'} cmp $branches->{$b}->{'branchname'}} keys %$branches ) {
my %row = (
value => $thisbranch,
branchname => $branches->{$thisbranch}->{'branchname'},
);
+ $row{'selected'} = 1 if( $thisbranch eq $data->{branchcode}) ;
push @branchloop, \%row;
}
-$template->param( branchloop => \@branchloop );
+$template->param( branchloop => \@branchloop , itypeloop => \@itemtypesloop );
# build bookfund list
my $borrower= GetMember($loggedinuser);
my ( $flags, $homebranch )= ($borrower->{'flags'},$borrower->{'branchcode'});
-my $count2;
-my @bookfund;
my @select_bookfund;
my %select_bookfunds;
-@bookfund = GetBookFunds($homebranch);
-$count2 = scalar @bookfund;
+my @bookfund = GetBookFunds($homebranch);
+my $count2 = scalar @bookfund;
for ( my $i = 0 ; $i < $count2 ; $i++ ) {
push @select_bookfund, $bookfund[$i]->{'bookfundid'};
}
my $CGIbookfund = CGI::scrolling_list(
-name => 'bookfund',
+ -id => 'bookfund',
-values => \@select_bookfund,
- -default => $data->{'bookfundid'},
+ -default => ($data->{'bookfundid'} ? $data->{'bookfundid'} : $select_bookfund[0]),
-labels => \%select_bookfunds,
- -size => 1,
- -tabindex=>'',
+ #-size => 1,
-multiple => 0
);
my $CGIsort1 = buildCGIsort( "Asort1", "sort1", $data->{'sort1'} );
if ($CGIsort1) {
$template->param( CGIsort1 => $CGIsort1 );
-}
-else {
+} else {
$template->param( sort1 => $data->{'sort1'} );
}
my $CGIsort2 = buildCGIsort( "Asort2", "sort2", $data->{'sort2'} );
if ($CGIsort2) {
$template->param( CGIsort2 => $CGIsort2 );
-}
-else {
+} else {
$template->param( sort2 => $data->{'sort2'} );
}
-my $bibitemsexists;
-
#do a biblioitems lookup on bib
my @bibitems = GetBiblioItemByBiblioNumber($biblionumber);
my $bibitemscount = scalar @bibitems;
if ( $bibitemscount > 0 ) {
# warn "NEWBIBLIO: bibitems for $biblio exists\n";
- $bibitemsexists = 1;
-
my @bibitemloop;
for ( my $i = 0 ; $i < $bibitemscount ; $i++ ) {
my %line;
basketno => $basketno,
booksellerid => $booksellerid,
suggestionid => $suggestionid,
- biblionumber => $biblionumber,
- biblioitemnumber => $data->{'biblioitemnumber'},
+ biblionumber => $biblionumber,
+ authorisedbyname => $borrower->{'firstname'} . " " . $borrower->{'surname'},
+ biblioitemnumber => $data->{'biblioitemnumber'},
itemtype => $data->{'itemtype'},
- discount => $booksellers[0]->{'discount'},
- listincgst => $booksellers[0]->{'listincgst'},
- listprice => $booksellers[0]->{'listprice'},
- gstreg => $booksellers[0]->{'gstreg'},
- invoiceinc => $booksellers[0]->{'invoiceincgst'},
- invoicedisc => $booksellers[0]->{'invoicedisc'},
- nocalc => $booksellers[0]->{'nocalc'},
- name => $booksellers[0]->{'name'},
- currency => $booksellers[0]->{'listprice'},
- gstrate => C4::Context->preference("gist"),
+ itemtype_desc => $itemtypes->{$data->{'itemtype'}}->{description},
+ discount => $bookseller->{'discount'},
+ listincgst => $bookseller->{'listincgst'},
+ listprice => $bookseller->{'listprice'},
+ gstreg => $bookseller->{'gstreg'},
+ invoiceinc => $bookseller->{'invoiceincgst'},
+ invoicedisc => $bookseller->{'invoicedisc'},
+ nocalc => $bookseller->{'nocalc'},
+ name => $bookseller->{'name'},
+ currency => $bookseller->{'listprice'},
+ gstrate => C4::Context->preference("gist") || 0,
loop_currencies => \@loop_currency,
orderexists => ( $new eq 'yes' ) ? 0 : 1,
title => $data->{'title'},
author => $data->{'author'},
copyrightdate => $data->{'copyrightdate'},
- CGIitemtype => $CGIitemtype,
CGIbookfund => $CGIbookfund,
isbn => $data->{'isbn'},
seriestitle => $data->{'seriestitle'},
total => $data->{ecost}*$data->{quantity},
invoice => $data->{'booksellerinvoicenumber'},
ecost => $data->{'ecost'},
+ purchaseordernumber => $data->{'purchaseordernumber'},
notes => $data->{'notes'},
publishercode => $data->{'publishercode'},
# donation => $donation
projects / koha.git / blobdiff