Third in the series of branch merges. Starting to run out of easy stuff. :)
This commit is contained in:
parent
cb7441a537
commit
3d0fb625a0
4 changed files with 11 additions and 7 deletions
|
@ -32,6 +32,7 @@ use CGI;
|
||||||
use DBI;
|
use DBI;
|
||||||
#use strict;
|
#use strict;
|
||||||
use C4::Acquisitions;
|
use C4::Acquisitions;
|
||||||
|
use C4::Biblio;
|
||||||
use C4::Output;
|
use C4::Output;
|
||||||
my $dbh=C4Connect;
|
my $dbh=C4Connect;
|
||||||
my $userid=$ENV{'REMOTE_USER'};
|
my $userid=$ENV{'REMOTE_USER'};
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
#written by chris@katipo.co.nz 24/2/2000
|
#written by chris@katipo.co.nz 24/2/2000
|
||||||
|
|
||||||
use C4::Acquisitions;
|
use C4::Acquisitions;
|
||||||
|
use C4::Biblio;
|
||||||
use C4::Output;
|
use C4::Output;
|
||||||
use C4::Database;
|
use C4::Database;
|
||||||
use C4::Search;
|
use C4::Search;
|
||||||
|
@ -190,7 +191,8 @@ print <<EOP
|
||||||
<td><select name=bookfund size=1>
|
<td><select name=bookfund size=1>
|
||||||
EOP
|
EOP
|
||||||
;
|
;
|
||||||
my ($count2,@bookfund)=bookfunds;
|
my @bookfund;
|
||||||
|
($count2,@bookfund)=bookfunds();
|
||||||
for (my $i=0;$i<$count2;$i++){
|
for (my $i=0;$i<$count2;$i++){
|
||||||
print "<option value=$bookfund[$i]->{'bookfundid'}";
|
print "<option value=$bookfund[$i]->{'bookfundid'}";
|
||||||
if ($bookfund[$i]->{'bookfundid'}==$results[0]->{'bookfundid'}){
|
if ($bookfund[$i]->{'bookfundid'}==$results[0]->{'bookfundid'}){
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
#written by chris@katipo.co.nz 24/2/2000
|
#written by chris@katipo.co.nz 24/2/2000
|
||||||
|
|
||||||
use C4::Acquisitions;
|
use C4::Acquisitions;
|
||||||
|
use C4::Biblio;
|
||||||
use C4::Output;
|
use C4::Output;
|
||||||
use CGI;
|
use CGI;
|
||||||
use strict;
|
use strict;
|
||||||
|
@ -54,11 +55,10 @@ $date
|
||||||
|
|
||||||
EOP
|
EOP
|
||||||
;
|
;
|
||||||
my ($count,@results);
|
my @results;
|
||||||
|
($count,@results)=invoice($invoice);
|
||||||
if ($invoice eq ''){
|
if ($invoice eq ''){
|
||||||
($count,@results)=getallorders($id);
|
($count,@results)=getallorders($id);
|
||||||
} else {
|
|
||||||
($count,@results)=invoice($invoice);
|
|
||||||
}
|
}
|
||||||
print $count;
|
print $count;
|
||||||
my $totalprice=0;
|
my $totalprice=0;
|
||||||
|
|
|
@ -10,6 +10,7 @@ use C4::Search;
|
||||||
use CGI;
|
use CGI;
|
||||||
use C4::Output;
|
use C4::Output;
|
||||||
use C4::Acquisitions;
|
use C4::Acquisitions;
|
||||||
|
use C4::Biblio;
|
||||||
|
|
||||||
my $input = new CGI;
|
my $input = new CGI;
|
||||||
#print $input->header;
|
#print $input->header;
|
||||||
|
@ -27,6 +28,6 @@ if ($count > 0){
|
||||||
print "This biblio has $count items attached, please delete them before deleting this biblio<p>
|
print "This biblio has $count items attached, please delete them before deleting this biblio<p>
|
||||||
";
|
";
|
||||||
} else {
|
} else {
|
||||||
delbiblio($biblio);
|
delbiblio($biblio);
|
||||||
print $input->redirect("/catalogue/");
|
print $input->redirect("/catalogue/");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue