[Koha-cvs] koha C4/Accounts2.pm C4/Auth.pm C4/Auth_with_ld... [rel_3_0]
paul poulain
paul at koha-fr.org
Fri Nov 17 15:57:24 CET 2006
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: paul poulain <tipaul> 06/11/17 14:57:23
Modified files:
C4 : Accounts2.pm Auth.pm Auth_with_ldap.pm
Biblio.pm Members.pm Reserves2.pm Search.pm
Serials.pm
C4/Circulation : Circ2.pm Fines.pm Returns.pm
circ : branchoverdues.pl branchtransfers.pl
circulation.pl reserve.pl returns.pl
koha-tmpl/intranet-tmpl/prog/en/admin: viewlog.tmpl
koha-tmpl/intranet-tmpl/prog/en/catalogue: detail.tmpl
issuehistory.tmpl
moredetail.tmpl
koha-tmpl/intranet-tmpl/prog/en/circ: branchoverdues.tmpl
branchreserves.tmpl
branchtransfers.tmpl
circulation.tmpl
currenttransfers.tmpl
reserve.tmpl returns.tmpl
waitingreservestransfers.tmpl
koha-tmpl/intranet-tmpl/prog/en/members: boraccount.tmpl
mancredit.tmpl
maninvoice.tmpl
member-quicksearch-results.tmpl
member.tmpl
moremember.tmpl
pay.tmpl
readingrec.tmpl
koha-tmpl/intranet-tmpl/prog/en/reports: bor_issues_top.tmpl
koha-tmpl/intranet-tmpl/prog/en/reserve: request.tmpl
koha-tmpl/intranet-tmpl/prog/en/serials: member-search.tmpl
viewalerts.tmpl
koha-tmpl/opac-tmpl/prog/en: opac-user.tmpl
members : boraccount.pl deletemem.pl mancredit.pl
maninvoice.pl memberentry.pl member-flags.pl
member-password.pl member-picupload.pl
moremember.pl pay.pl readingrec.pl setdebar.pl
misc : fines2.pl fines.pl overduenotices-30.pl
overduenotices.pl tidyaccounts.pl
misc/notifys : contact_history.pl printnote.pl
misc/plugin : Search.pm
opac : opac-moredetail.pl opac-renew.pl
reports : borrowers_out.pl overdue.pl stats.pl
reserve : modrequest.pl placerequest.pl renewscript.pl
request.pl
serials : routing.pl
Log message:
code cleaning : moving bornum, borrnum, bornumber to a correct "borrowernumber"
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Accounts2.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.30.2.1&r2=1.30.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Auth.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.54.2.7&r2=1.54.2.8
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Auth_with_ldap.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.5&r2=1.5.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Biblio.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.178.2.25&r2=1.178.2.26
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Members.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.32.2.16&r2=1.32.2.17
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Reserves2.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.46.2.5&r2=1.46.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Search.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.120.2.27&r2=1.120.2.28
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Serials.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.5.2.8&r2=1.5.2.9
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Circulation/Circ2.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.114.2.15&r2=1.114.2.16
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Circulation/Fines.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.14.2.5&r2=1.14.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Circulation/Returns.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.10.2.1&r2=1.10.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/circ/branchoverdues.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/circ/branchtransfers.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.24.2.2&r2=1.24.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/circ/circulation.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.97.2.5&r2=1.97.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/circ/reserve.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.1&r2=1.3.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/circ/returns.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.43.2.4&r2=1.43.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/viewlog.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/detail.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.8&r2=1.2.2.9
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/issuehistory.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.4&r2=1.1.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/moredetail.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.4&r2=1.1.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/branchoverdues.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/branchreserves.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.1&r2=1.2.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.4.2.4&r2=1.4.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.6.2.9&r2=1.6.2.10
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/currenttransfers.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/reserve.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.4.2.5&r2=1.4.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/waitingreservestransfers.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.1&r2=1.2.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/boraccount.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2&r2=1.2.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/mancredit.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/maninvoice.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/member-quicksearch-results.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.2&r2=1.2.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.12.2.11&r2=1.12.2.12
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/pay.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.4.2.1&r2=1.4.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/readingrec.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.2&r2=1.3.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reports/bor_issues_top.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.7&r2=1.3.2.8
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/member-search.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.1&r2=1.3.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/viewalerts.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-user.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/members/boraccount.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2&r2=1.2.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/members/deletemem.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.9.2.1&r2=1.9.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/members/mancredit.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/members/maninvoice.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/members/memberentry.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.38.2.14&r2=1.38.2.15
http://cvs.savannah.gnu.org/viewcvs/koha/members/member-flags.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.5&r2=1.5.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/members/member-password.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.4&r2=1.4.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/members/member-picupload.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/members/moremember.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.28.2.7&r2=1.28.2.8
http://cvs.savannah.gnu.org/viewcvs/koha/members/pay.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.4.2.1&r2=1.4.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/members/readingrec.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2&r2=1.2.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/members/setdebar.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.1&r2=1.3.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/misc/fines2.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.12&r2=1.12.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/misc/fines.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.4&r2=1.1.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/misc/overduenotices-30.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/misc/overduenotices.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.4&r2=1.4.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/misc/tidyaccounts.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.4&r2=1.4.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/misc/notifys/contact_history.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.8.1
http://cvs.savannah.gnu.org/viewcvs/koha/misc/notifys/printnote.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.8.1
http://cvs.savannah.gnu.org/viewcvs/koha/misc/plugin/Search.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-moredetail.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.9.2.4&r2=1.9.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-renew.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3&r2=1.3.8.1
http://cvs.savannah.gnu.org/viewcvs/koha/reports/borrowers_out.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.6.2.2&r2=1.6.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/reports/overdue.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/reports/stats.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/reserve/modrequest.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.2&r2=1.2.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/reserve/placerequest.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.3&r2=1.3.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/reserve/renewscript.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3&r2=1.3.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/reserve/request.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.6.2.6&r2=1.6.2.7
http://cvs.savannah.gnu.org/viewcvs/koha/serials/routing.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3
Patches:
Index: C4/Accounts2.pm
===================================================================
RCS file: /sources/koha/koha/C4/Accounts2.pm,v
retrieving revision 1.30.2.1
retrieving revision 1.30.2.2
diff -u -b -r1.30.2.1 -r1.30.2.2
--- C4/Accounts2.pm 30 Aug 2006 16:38:51 -0000 1.30.2.1
+++ C4/Accounts2.pm 17 Nov 2006 14:57:21 -0000 1.30.2.2
@@ -18,7 +18,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: Accounts2.pm,v 1.30.2.1 2006/08/30 16:38:51 toins Exp $
+# $Id: Accounts2.pm,v 1.30.2.2 2006/11/17 14:57:21 tipaul Exp $
use strict;
require Exporter;
use DBI;
@@ -29,7 +29,7 @@
use vars qw($VERSION @ISA @EXPORT);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.30.2.1 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.30.2.2 $' =~ /\d+/g;
shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
=head1 NAME
@@ -73,12 +73,12 @@
sub checkaccount {
#take borrower number
#check accounts and list amounts owing
- my ($env,$bornumber,$dbh,$date)=@_;
+ my ($env,$borrowernumber,$dbh,$date)=@_;
my $select="SELECT SUM(amountoutstanding) AS total
FROM accountlines
WHERE borrowernumber = ?
AND amountoutstanding<>0";
- my @bind = ($bornumber);
+ my @bind = ($borrowernumber);
if ($date && $date ne ''){
$select.=" AND date < ?";
push(@bind,$date);
@@ -93,7 +93,7 @@
#if ($total > 0){
# # output(1,2,"borrower owes $total");
# if ($total > 5){
- # reconcileaccount($env,$dbh,$bornumber,$total);
+ # reconcileaccount($env,$dbh,$borrowernumber,$total);
# }
#}
# pause();
@@ -119,7 +119,7 @@
#'
sub recordpayment{
#here we update both the accountoffsets and the account lines
- my ($env,$bornumber,$data)=@_;
+ my ($env,$borrowernumber,$data)=@_;
warn "in accounts2.pm";
my $dbh = C4::Context->dbh;
my $newamtos = 0;
@@ -128,12 +128,12 @@
warn $branch;
my $amountleft = $data;
# begin transaction
- my $nextaccntno = getnextacctno($env,$bornumber,$dbh);
+ my $nextaccntno = getnextacctno($env,$borrowernumber,$dbh);
# get lines with outstanding amounts to offset
my $sth = $dbh->prepare("select * from accountlines
where (borrowernumber = ?) and (amountoutstanding<>0)
order by date");
- $sth->execute($bornumber);
+ $sth->execute($borrowernumber);
# offset transactions
while (($accdata=$sth->fetchrow_hashref) and ($amountleft>0)){
if ($accdata->{'amountoutstanding'} < $amountleft) {
@@ -146,21 +146,21 @@
my $thisacct = $accdata->{accountno};
my $usth = $dbh->prepare("update accountlines set amountoutstanding= ?
where (borrowernumber = ?) and (accountno=?)");
- $usth->execute($newamtos,$bornumber,$thisacct);
+ $usth->execute($newamtos,$borrowernumber,$thisacct);
$usth->finish;
$usth = $dbh->prepare("insert into accountoffsets
(borrowernumber, accountno, offsetaccount, offsetamount)
values (?,?,?,?)");
- $usth->execute($bornumber,$accdata->{'accountno'},$nextaccntno,$newamtos);
+ $usth->execute($borrowernumber,$accdata->{'accountno'},$nextaccntno,$newamtos);
$usth->finish;
}
# create new line
my $usth = $dbh->prepare("insert into accountlines
(borrowernumber, accountno,date,amount,description,accounttype,amountoutstanding)
values (?,?,now(),?,'Payment,thanks','Pay',?)");
- $usth->execute($bornumber,$nextaccntno,0-$data,0-$amountleft);
+ $usth->execute($borrowernumber,$nextaccntno,0-$data,0-$amountleft);
$usth->finish;
- UpdateStats($env,$branch,'payment',$data,'','','',$bornumber);
+ UpdateStats($env,$branch,'payment',$data,'','','',$borrowernumber);
$sth->finish;
}
@@ -185,22 +185,22 @@
#here we update both the accountoffsets and the account lines
#updated to check, if they are paying off a lost item, we return the item
# from their card, and put a note on the item record
- my ($bornumber,$accountno,$amount,$user,$branch)=@_;
+ my ($borrowernumber,$accountno,$amount,$user,$branch)=@_;
my %env;
$env{'branchcode'}=$branch;
my $dbh = C4::Context->dbh;
# begin transaction
- my $nextaccntno = getnextacctno(\%env,$bornumber,$dbh);
+ my $nextaccntno = getnextacctno(\%env,$borrowernumber,$dbh);
my $newamtos=0;
my $sth=$dbh->prepare("Select * from accountlines where borrowernumber=? and accountno=?");
- $sth->execute($bornumber,$accountno);
+ $sth->execute($borrowernumber,$accountno);
my $data=$sth->fetchrow_hashref;
$sth->finish;
$dbh->do(<<EOT);
UPDATE accountlines
SET amountoutstanding = 0
- WHERE borrowernumber = $bornumber
+ WHERE borrowernumber = $borrowernumber
AND accountno = $accountno
EOT
@@ -209,7 +209,7 @@
INSERT INTO accountoffsets
(borrowernumber, accountno, offsetaccount,
offsetamount)
- VALUES ($bornumber, $accountno, $nextaccntno, $newamtos)
+ VALUES ($borrowernumber, $accountno, $nextaccntno, $newamtos)
EOT
# create new line
@@ -218,18 +218,18 @@
INSERT INTO accountlines
(borrowernumber, accountno, date, amount,
description, accounttype, amountoutstanding)
- VALUES ($bornumber, $nextaccntno, now(), $payment,
+ VALUES ($borrowernumber, $nextaccntno, now(), $payment,
'Payment,thanks - $user', 'Pay', 0)
EOT
# FIXME - The second argument to &UpdateStats is supposed to be the
# branch code.
# UpdateStats is now being passed $accountno too. MTJ
- UpdateStats(\%env,$user,'payment',$amount,'','','',$bornumber,$accountno);
+ UpdateStats(\%env,$user,'payment',$amount,'','','',$borrowernumber,$accountno);
$sth->finish;
#check to see what accounttype
if ($data->{'accounttype'} eq 'Rep' || $data->{'accounttype'} eq 'L'){
- returnlost($bornumber,$data->{'itemnumber'});
+ returnlost($borrowernumber,$data->{'itemnumber'});
}
}
@@ -248,12 +248,12 @@
#'
# FIXME - Okay, so what does the above actually _mean_?
sub getnextacctno {
- my ($env,$bornumber,$dbh)=@_;
+ my ($env,$borrowernumber,$dbh)=@_;
my $nextaccntno = 1;
my $sth = $dbh->prepare("select * from accountlines
where (borrowernumber = ?)
order by accountno desc");
- $sth->execute($bornumber);
+ $sth->execute($borrowernumber);
if (my $accdata=$sth->fetchrow_hashref){
$nextaccntno = $accdata->{'accountno'} + 1;
}
@@ -291,12 +291,12 @@
# FIXME - Never used, but not exported, either.
sub returnlost{
- my ($borrnum,$itemnum)=@_;
+ my ($borrowernumber,$itemnum)=@_;
my $dbh = C4::Context->dbh;
- my $borrower=borrdata('',$borrnum);
+ my $borrower=borrdata('',$borrowernumber);
my $sth=$dbh->prepare("Update issues set returndate=now() where
borrowernumber=? and itemnumber=? and returndate is null");
- $sth->execute($borrnum,$itemnum);
+ $sth->execute($borrowernumber,$itemnum);
$sth->finish;
my @datearr = localtime(time);
my $date = (1900+$datearr[5])."-".($datearr[4]+1)."-".$datearr[3];
@@ -322,18 +322,18 @@
#'
# FIXME - Okay, so what does this function do, really?
sub manualinvoice{
- my ($bornum,$itemnum,$desc,$type,$amount,$user)=@_;
+ my ($borrowernumber,$itemnum,$desc,$type,$amount,$user)=@_;
my $dbh = C4::Context->dbh;
my $insert;
$itemnum=~ s/ //g;
my %env;
- my $accountno=getnextacctno('',$bornum,$dbh);
+ my $accountno=getnextacctno('',$borrowernumber,$dbh);
my $amountleft=$amount;
if ($type eq 'CS' || $type eq 'CB' || $type eq 'CW'
|| $type eq 'CF' || $type eq 'CL'){
my $amount2=$amount*-1; # FIXME - $amount2 = -$amount
- $amountleft=fixcredit(\%env,$bornum,$amount2,$itemnum,$type,$user);
+ $amountleft=fixcredit(\%env,$borrowernumber,$amount2,$itemnum,$type,$user);
}
if ($type eq 'N'){
$desc.="New Card";
@@ -342,38 +342,38 @@
$desc="Lost Item";
}
if ($type eq 'REF'){
- $amountleft=refund('',$bornum,$amount);
+ $amountleft=refund('',$borrowernumber,$amount);
}
if ($itemnum ne ''){
$desc.=" ".$itemnum;
my $sth=$dbh->prepare("INSERT INTO accountlines
(borrowernumber, accountno, date, amount, description, accounttype, amountoutstanding, itemnumber)
VALUES (?, ?, now(), ?,?, ?,?,?)");
-# $sth->execute($bornum, $accountno, $amount, $desc, $type, $amountleft, $data->{'itemnumber'});
- $sth->execute($bornum, $accountno, $amount, $desc, $type, $amountleft, $itemnum);
+# $sth->execute($borrowernumber, $accountno, $amount, $desc, $type, $amountleft, $data->{'itemnumber'});
+ $sth->execute($borrowernumber, $accountno, $amount, $desc, $type, $amountleft, $itemnum);
} else {
my $sth=$dbh->prepare("INSERT INTO accountlines
(borrowernumber, accountno, date, amount, description, accounttype, amountoutstanding)
VALUES (?, ?, now(), ?, ?, ?, ?)");
- $sth->execute($bornum, $accountno, $amount, $desc, $type, $amountleft);
+ $sth->execute($borrowernumber, $accountno, $amount, $desc, $type, $amountleft);
}
}
# fixcredit
-# $amountleft = &fixcredit($env, $bornumber, $data, $barcode, $type, $user);
+# $amountleft = &fixcredit($env, $borrowernumber, $data, $barcode, $type, $user);
#
# This function is only used internally.
# FIXME - Figure out what this function does, and write it down.
sub fixcredit{
#here we update both the accountoffsets and the account lines
- my ($env,$bornumber,$data,$barcode,$type,$user)=@_;
+ my ($env,$borrowernumber,$data,$barcode,$type,$user)=@_;
my $dbh = C4::Context->dbh;
my $newamtos = 0;
my $accdata = "";
my $amountleft = $data;
if ($barcode ne ''){
my $item=getiteminformation('',$barcode);
- my $nextaccntno = getnextacctno($env,$bornumber,$dbh);
+ my $nextaccntno = getnextacctno($env,$borrowernumber,$dbh);
my $query="Select * from accountlines where (borrowernumber=?
and itemnumber=? and amountoutstanding > 0)";
if ($type eq 'CL'){
@@ -386,7 +386,7 @@
}
# print $query;
my $sth=$dbh->prepare($query);
- $sth->execute($bornumber,$item->{'itemnumber'});
+ $sth->execute($borrowernumber,$item->{'itemnumber'});
$accdata=$sth->fetchrow_hashref;
$sth->finish;
if ($accdata->{'amountoutstanding'} < $amountleft) {
@@ -399,21 +399,21 @@
my $thisacct = $accdata->{accountno};
my $usth = $dbh->prepare("update accountlines set amountoutstanding= ?
where (borrowernumber = ?) and (accountno=?)");
- $usth->execute($newamtos,$bornumber,$thisacct);
+ $usth->execute($newamtos,$borrowernumber,$thisacct);
$usth->finish;
$usth = $dbh->prepare("insert into accountoffsets
(borrowernumber, accountno, offsetaccount, offsetamount)
values (?,?,?,?)");
- $usth->execute($bornumber,$accdata->{'accountno'},$nextaccntno,$newamtos);
+ $usth->execute($borrowernumber,$accdata->{'accountno'},$nextaccntno,$newamtos);
$usth->finish;
}
# begin transaction
- my $nextaccntno = getnextacctno($env,$bornumber,$dbh);
+ my $nextaccntno = getnextacctno($env,$borrowernumber,$dbh);
# get lines with outstanding amounts to offset
my $sth = $dbh->prepare("select * from accountlines
where (borrowernumber = ?) and (amountoutstanding >0)
order by date");
- $sth->execute($bornumber);
+ $sth->execute($borrowernumber);
# print $query;
# offset transactions
while (($accdata=$sth->fetchrow_hashref) and ($amountleft>0)){
@@ -427,18 +427,18 @@
my $thisacct = $accdata->{accountno};
my $usth = $dbh->prepare("update accountlines set amountoutstanding= ?
where (borrowernumber = ?) and (accountno=?)");
- $usth->execute($newamtos,$bornumber,$thisacct);
+ $usth->execute($newamtos,$borrowernumber,$thisacct);
$usth->finish;
$usth = $dbh->prepare("insert into accountoffsets
(borrowernumber, accountno, offsetaccount, offsetamount)
values (?,?,?,?)");
- $usth->execute($bornumber,$accdata->{'accountno'},$nextaccntno,$newamtos);
+ $usth->execute($borrowernumber,$accdata->{'accountno'},$nextaccntno,$newamtos);
$usth->finish;
}
$sth->finish;
$env->{'branch'}=$user;
$type="Credit ".$type;
- UpdateStats($env,$user,$type,$data,$user,'','',$bornumber);
+ UpdateStats($env,$user,$type,$data,$user,'','',$borrowernumber);
$amountleft*=-1;
return($amountleft);
@@ -447,7 +447,7 @@
# FIXME - Figure out what this function does, and write it down.
sub refund{
#here we update both the accountoffsets and the account lines
- my ($env,$bornumber,$data)=@_;
+ my ($env,$borrowernumber,$data)=@_;
my $dbh = C4::Context->dbh;
my $newamtos = 0;
my $accdata = "";
@@ -455,12 +455,12 @@
my $amountleft = $data *-1;
# begin transaction
- my $nextaccntno = getnextacctno($env,$bornumber,$dbh);
+ my $nextaccntno = getnextacctno($env,$borrowernumber,$dbh);
# get lines with outstanding amounts to offset
my $sth = $dbh->prepare("select * from accountlines
where (borrowernumber = ?) and (amountoutstanding<0)
order by date");
- $sth->execute($bornumber);
+ $sth->execute($borrowernumber);
# print $amountleft;
# offset transactions
while (($accdata=$sth->fetchrow_hashref) and ($amountleft<0)){
@@ -475,12 +475,12 @@
my $thisacct = $accdata->{accountno};
my $usth = $dbh->prepare("update accountlines set amountoutstanding= ?
where (borrowernumber = ?) and (accountno=?)");
- $usth->execute($newamtos,$bornumber,$thisacct);
+ $usth->execute($newamtos,$borrowernumber,$thisacct);
$usth->finish;
$usth = $dbh->prepare("insert into accountoffsets
(borrowernumber, accountno, offsetaccount, offsetamount)
values (?,?,?,?)");
- $usth->execute($bornumber,$accdata->{'accountno'},$nextaccntno,$newamtos);
+ $usth->execute($borrowernumber,$accdata->{'accountno'},$nextaccntno,$newamtos);
$usth->finish;
}
$sth->finish;
Index: C4/Auth.pm
===================================================================
RCS file: /sources/koha/koha/C4/Auth.pm,v
retrieving revision 1.54.2.7
retrieving revision 1.54.2.8
diff -u -b -r1.54.2.7 -r1.54.2.8
--- C4/Auth.pm 20 Oct 2006 15:29:29 -0000 1.54.2.7
+++ C4/Auth.pm 17 Nov 2006 14:57:21 -0000 1.54.2.8
@@ -36,7 +36,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.54.2.7 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.54.2.8 $' =~ /\d+/g;
shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
=head1 NAME
@@ -455,7 +455,7 @@
C4::Context->_unset_userenv($sessionID);
}
if ( $return == 1 ) {
- my ( $bornum, $firstname, $surname, $userflags, $branchcode,
+ my ( $borrowernumber, $firstname, $surname, $userflags, $branchcode,
$branchname, $branchprinter, $emailaddress );
my $sth =
$dbh->prepare(
@@ -463,13 +463,13 @@
);
$sth->execute($userid);
(
- $bornum, $firstname, $surname, $userflags, $branchcode,
+ $borrowernumber, $firstname, $surname, $userflags, $branchcode,
$branchname, $branchprinter, $emailaddress
)
= $sth->fetchrow
if ( $sth->rows );
-# warn "$cardnumber,$bornum,$userid,$firstname,$surname,$userflags,$branchcode,$emailaddress";
+# warn "$cardnumber,$borrowernumber,$userid,$firstname,$surname,$userflags,$branchcode,$emailaddress";
unless ( $sth->rows ) {
my $sth =
$dbh->prepare(
@@ -477,24 +477,24 @@
);
$sth->execute($cardnumber);
(
- $bornum, $firstname, $surname, $userflags, $branchcode,
+ $borrowernumber, $firstname, $surname, $userflags, $branchcode,
$branchcode, $branchprinter, $emailaddress
)
= $sth->fetchrow
if ( $sth->rows );
-# warn "$cardnumber,$bornum,$userid,$firstname,$surname,$userflags,$branchcode,$emailaddress";
+# warn "$cardnumber,$borrowernumber,$userid,$firstname,$surname,$userflags,$branchcode,$emailaddress";
unless ( $sth->rows ) {
$sth->execute($userid);
(
- $bornum, $firstname, $surname, $userflags,
+ $borrowernumber, $firstname, $surname, $userflags,
$branchcode, $branchprinter, $emailaddress
)
= $sth->fetchrow
if ( $sth->rows );
}
-# warn "$cardnumber,$bornum,$userid,$firstname,$surname,$userflags,$branchcode,$emailaddress";
+# warn "$cardnumber,$borrowernumber,$userid,$firstname,$surname,$userflags,$branchcode,$emailaddress";
}
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
@@ -518,7 +518,7 @@
}
my $hash = C4::Context::set_userenv(
- $bornum, $userid, $cardnumber,
+ $borrowernumber, $userid, $cardnumber,
$firstname, $surname, $branchcode,
$branchname, $userflags, $emailaddress,
$branchprinter,
@@ -640,20 +640,20 @@
$dbh->prepare("select password,cardnumber,borrowernumber,userid,firstname,surname,branchcode,flags from borrowers where userid=?");
$sth->execute($userid);
if ( $sth->rows ) {
- my ( $md5password, $cardnumber,$bornum,$userid,$firstname,$surname,$branchcode,$flags ) = $sth->fetchrow;
+ my ( $md5password, $cardnumber,$borrowernumber,$userid,$firstname,$surname,$branchcode,$flags ) = $sth->fetchrow;
if ( md5_base64($password) eq $md5password ) {
- C4::Context->set_userenv("$bornum",$userid,$cardnumber,$firstname,$surname,$branchcode,$flags);
+ C4::Context->set_userenv("$borrowernumber",$userid,$cardnumber,$firstname,$surname,$branchcode,$flags);
return 1, $cardnumber;
}
}
$sth = $dbh->prepare("select password,cardnumber,borrowernumber,userid, firstname,surname,branchcode,flags from borrowers where cardnumber=?");
$sth->execute($userid);
if ( $sth->rows ) {
- my ( $md5password, $cardnumber,$bornum,$userid,$firstname,$surname,$branchcode,$flags ) = $sth->fetchrow;
+ my ( $md5password, $cardnumber,$borrowernumber,$userid,$firstname,$surname,$branchcode,$flags ) = $sth->fetchrow;
if ( md5_base64($password) eq $md5password ) {
- C4::Context->set_userenv($bornum,$userid,$cardnumber,$firstname,$surname,$branchcode,$flags);
+ C4::Context->set_userenv($borrowernumber,$userid,$cardnumber,$firstname,$surname,$branchcode,$flags);
return 1, $userid;
}
}
Index: C4/Auth_with_ldap.pm
===================================================================
RCS file: /sources/koha/koha/C4/Auth_with_ldap.pm,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -b -r1.5 -r1.5.2.1
--- C4/Auth_with_ldap.pm 6 Jan 2006 16:39:37 -0000 1.5
+++ C4/Auth_with_ldap.pm 17 Nov 2006 14:57:21 -0000 1.5.2.1
@@ -396,21 +396,21 @@
C4::Context->_unset_userenv($sessionID);
}
if ($return == 1){
- my ($bornum,$firstname,$surname,$userflags,$branchcode,$emailaddress);
+ my ($borrowernumber,$firstname,$surname,$userflags,$branchcode,$emailaddress);
my $sth=$dbh->prepare("select borrowernumber,firstname,surname,flags,branchcode,emailaddress from borrowers where userid=?");
$sth->execute($userid);
- ($bornum,$firstname,$surname,$userflags,$branchcode,$emailaddress) = $sth->fetchrow if ($sth->rows);
+ ($borrowernumber,$firstname,$surname,$userflags,$branchcode,$emailaddress) = $sth->fetchrow if ($sth->rows);
unless ($sth->rows){
my $sth=$dbh->prepare("select borrowernumber,firstname,surname,flags,branchcode,emailaddress from borrowers where cardnumber=?");
$sth->execute($cardnumber);
- ($bornum,$firstname,$surname,$userflags,$branchcode,$emailaddress) = $sth->fetchrow if ($sth->rows);
+ ($borrowernumber,$firstname,$surname,$userflags,$branchcode,$emailaddress) = $sth->fetchrow if ($sth->rows);
unless ($sth->rows){
$sth->execute($userid);
- ($bornum,$firstname,$surname,$userflags,$branchcode,$emailaddress) = $sth->fetchrow if ($sth->rows);
+ ($borrowernumber,$firstname,$surname,$userflags,$branchcode,$emailaddress) = $sth->fetchrow if ($sth->rows);
}
}
my $hash = C4::Context::set_userenv(
- $bornum,
+ $borrowernumber,
$userid,
$cardnumber,
$firstname,
Index: C4/Biblio.pm
===================================================================
RCS file: /sources/koha/koha/C4/Biblio.pm,v
retrieving revision 1.178.2.25
retrieving revision 1.178.2.26
diff -u -b -r1.178.2.25 -r1.178.2.26
--- C4/Biblio.pm 17 Nov 2006 13:18:58 -0000 1.178.2.25
+++ C4/Biblio.pm 17 Nov 2006 14:57:21 -0000 1.178.2.26
@@ -323,7 +323,7 @@
$record->append_fields($newtag);
}
# add the item
- my $biblionumber = &MARCadditem( $dbh, $record, $item->{'biblionumber'} );
+ &MARCadditem( $dbh, $record, $item->{'biblionumber'} );
return ($item->{biblionumber}, $item->{biblioitemnumber},$itemnumber);
}
@@ -3642,8 +3642,11 @@
=cut
-# $Id: Biblio.pm,v 1.178.2.25 2006/11/17 13:18:58 tipaul Exp $
+# $Id: Biblio.pm,v 1.178.2.26 2006/11/17 14:57:21 tipaul Exp $
# $Log: Biblio.pm,v $
+# Revision 1.178.2.26 2006/11/17 14:57:21 tipaul
+# code cleaning : moving bornum, borrnum, bornumber to a correct "borrowernumber"
+#
# Revision 1.178.2.25 2006/11/17 13:18:58 tipaul
# code cleaning : removing use of "bib", and replacing with "biblionumber"
#
Index: C4/Members.pm
===================================================================
RCS file: /sources/koha/koha/C4/Members.pm,v
retrieving revision 1.32.2.16
retrieving revision 1.32.2.17
diff -u -b -r1.32.2.16 -r1.32.2.17
--- C4/Members.pm 16 Nov 2006 10:06:10 -0000 1.32.2.16
+++ C4/Members.pm 17 Nov 2006 14:57:21 -0000 1.32.2.17
@@ -19,7 +19,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: Members.pm,v 1.32.2.16 2006/11/16 10:06:10 toins Exp $
+# $Id: Members.pm,v 1.32.2.17 2006/11/17 14:57:21 tipaul Exp $
use strict;
require Exporter;
@@ -31,7 +31,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
-$VERSION = do { my @v = '$Revision: 1.32.2.16 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.32.2.17 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
=head1 NAME
@@ -203,17 +203,17 @@
=cut
sub GetMember {
- my ( $cardnumber, $bornum ) = @_;
+ my ( $cardnumber, $borrowernumber ) = @_;
$cardnumber = uc $cardnumber;
my $dbh = C4::Context->dbh;
my $sth;
- if ( $bornum eq '' ) {
+ if ( $borrowernumber eq '' ) {
$sth = $dbh->prepare("Select * from borrowers where cardnumber=?");
$sth->execute($cardnumber);
}
else {
$sth = $dbh->prepare("Select * from borrowers where borrowernumber=?");
- $sth->execute($bornum);
+ $sth->execute($borrowernumber);
}
my $data = $sth->fetchrow_hashref;
$sth->finish;
@@ -248,11 +248,11 @@
#'
sub borrdata {
- my ( $cardnumber, $bornum ) = @_;
+ my ( $cardnumber, $borrowernumber ) = @_;
$cardnumber = uc $cardnumber;
my $dbh = C4::Context->dbh;
my $sth;
- if ( $bornum eq '' ) {
+ if ( $borrowernumber eq '' ) {
$sth =
$dbh->prepare(
"Select borrowers.*,categories.category_type from borrowers left join categories on borrowers.categorycode=categories.categorycode where cardnumber=?"
@@ -264,7 +264,7 @@
$dbh->prepare(
"Select borrowers.*,categories.category_type from borrowers left join categories on borrowers.categorycode=categories.categorycode where borrowernumber=?"
);
- $sth->execute($bornum);
+ $sth->execute($borrowernumber);
}
my $data = $sth->fetchrow_hashref;
# warn "DATA" . $data->{category_type};
@@ -305,9 +305,9 @@
#'
sub borrdata2 {
- my ( $env, $bornum ) = @_;
+ my ( $env, $borrowernumber ) = @_;
my $dbh = C4::Context->dbh;
- my $query = "Select count(*) from issues where borrowernumber='$bornum' and
+ my $query = "Select count(*) from issues where borrowernumber='$borrowernumber' and
returndate is NULL";
# print $query;
@@ -317,14 +317,14 @@
$sth->finish;
$sth = $dbh->prepare(
"Select count(*) from issues where
- borrowernumber='$bornum' and date_due < now() and returndate is NULL"
+ borrowernumber='$borrowernumber' and date_due < now() and returndate is NULL"
);
$sth->execute;
my $data2 = $sth->fetchrow_hashref;
$sth->finish;
$sth = $dbh->prepare(
"Select sum(amountoutstanding) from accountlines where
- borrowernumber='$bornum'"
+ borrowernumber='$borrowernumber'"
);
$sth->execute;
my $data3 = $sth->fetchrow_hashref;
@@ -690,13 +690,13 @@
}
sub findguarantees {
- my ($bornum) = @_;
+ my ($borrowernumber) = @_;
my $dbh = C4::Context->dbh;
my $sth = $dbh->prepare(
"select cardnumber,borrowernumber from borrowers where
guarantorid=?"
);
- $sth->execute($bornum);
+ $sth->execute($borrowernumber);
my @dat;
my $i = 0;
while ( my $data = $sth->fetchrow_hashref ) {
@@ -725,10 +725,10 @@
#'
sub findguarantor {
- my ($bornum) = @_;
+ my ($borrowernumber) = @_;
my $dbh = C4::Context->dbh;
my $sth = $dbh->prepare("Select * from borrowers where borrowernumber=?");
- $sth->execute($bornum);
+ $sth->execute($borrowernumber);
my $data = $sth->fetchrow_hashref;
$sth->finish;
return ($data);
@@ -857,7 +857,7 @@
#'
sub borrissues {
- my ($bornum) = @_;
+ my ($borrowernumber) = @_;
my $dbh = C4::Context->dbh;
my $sth = $dbh->prepare(
"Select * from issues,biblio,items where borrowernumber=?
@@ -865,7 +865,7 @@
and items.biblionumber=biblio.biblionumber
and issues.returndate is NULL order by date_due"
);
- $sth->execute($bornum);
+ $sth->execute($borrowernumber);
my @result;
while ( my $data = $sth->fetchrow_hashref ) {
push @result, $data;
@@ -897,7 +897,7 @@
#'
sub allissues {
- my ( $bornum, $order, $limit ) = @_;
+ my ( $borrowernumber, $order, $limit ) = @_;
#FIXME: sanity-check order and limit
my $dbh = C4::Context->dbh;
@@ -913,7 +913,7 @@
#print $query;
my $sth = $dbh->prepare($query);
- $sth->execute($bornum);
+ $sth->execute($borrowernumber);
my @result;
my $i = 0;
while ( my $data = $sth->fetchrow_hashref ) {
@@ -922,7 +922,7 @@
$count++;
}
- # get all issued items for bornum from oldissues table
+ # get all issued items for borrowernumber from oldissues table
# large chunk of older issues data put into table oldissues
# to speed up db calls for issuing items
if(C4::Context->preference("ReadingHistory")){
@@ -938,7 +938,7 @@
}
my $sth2=$dbh->prepare($query2);
- $sth2->execute($bornum);
+ $sth2->execute($borrowernumber);
while (my $data2=$sth2->fetchrow_hashref){
$result[$i]=$data2;
@@ -1388,8 +1388,8 @@
my $query =
"INSERT INTO borrowers_to_borrowers (borrower1,borrower2) VALUES (?,?)";
my $sth = $dbh->prepare($query);
- foreach my $bornum (@$otherborrowers) {
- $sth->execute( $borrowernumber, $bornum );
+ foreach my $otherborrowernumber (@$otherborrowers) {
+ $sth->execute( $borrowernumber, $otherborrowernumber );
}
$sth->finish();
Index: C4/Reserves2.pm
===================================================================
RCS file: /sources/koha/koha/C4/Reserves2.pm,v
retrieving revision 1.46.2.5
retrieving revision 1.46.2.6
diff -u -b -r1.46.2.5 -r1.46.2.6
--- C4/Reserves2.pm 17 Nov 2006 13:18:58 -0000 1.46.2.5
+++ C4/Reserves2.pm 17 Nov 2006 14:57:21 -0000 1.46.2.6
@@ -20,7 +20,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: Reserves2.pm,v 1.46.2.5 2006/11/17 13:18:58 tipaul Exp $
+# $Id: Reserves2.pm,v 1.46.2.6 2006/11/17 14:57:21 tipaul Exp $
use strict;
require Exporter;
@@ -31,7 +31,7 @@
my $library_name = C4::Context->preference("LibraryName");
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.46.2.5 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.46.2.6 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
=head1 NAME
@@ -903,7 +903,7 @@
=item CreateReserve
-CreateReserve($env,$branch,$borrnum,$biblionumber,$constraint,$bibitems,$priority,$notes,$title,$checkitem,$found)
+CreateReserve($env,$branch,$borrowernumber,$biblionumber,$constraint,$bibitems,$priority,$notes,$title,$checkitem,$found)
FIXME - A somewhat different version of this function appears in
C4::Reserves. Pick one and stick with it.
@@ -911,12 +911,12 @@
=cut
sub CreateReserve {
- my ($env,$branch,$borrnum,$biblionumber,$constraint,$bibitems,$priority,$notes,$title,$checkitem,$found)= @_;
+ my ($env,$branch,$borrowernumber,$biblionumber,$constraint,$bibitems,$priority,$notes,$title,$checkitem,$found)= @_;
my $fee;
if($library_name =~ /Horowhenua/){
- $fee = CalcHLTReserveFee($env,$borrnum,$biblionumber,$constraint,$bibitems);
+ $fee = CalcHLTReserveFee($env,$borrowernumber,$biblionumber,$constraint,$bibitems);
} else {
- $fee = CalcReserveFee($env,$borrnum,$biblionumber,$constraint,$bibitems);
+ $fee = CalcReserveFee($env,$borrowernumber,$biblionumber,$constraint,$bibitems);
}
my $dbh = C4::Context->dbh;
my $const = lc substr($constraint,0,1);
@@ -930,7 +930,7 @@
#eval {
# updates take place here
if ($fee > 0) {
- my $nextacctno = &getnextacctno($env,$borrnum,$dbh);
+ my $nextacctno = &getnextacctno($env,$borrowernumber,$dbh);
my $query =qq/
INSERT INTO accountlines
(borrowernumber,accountno,date,amount,description,accounttype,amountoutstanding)
@@ -938,7 +938,7 @@
(?,?,now(),?,?,'Res',?)
/;
my $usth = $dbh->prepare($query);
- $usth->execute($borrnum,$nextacctno,$fee,"Reserve Charge - $title",$fee);
+ $usth->execute($borrowernumber,$nextacctno,$fee,"Reserve Charge - $title",$fee);
$usth->finish;
}
#if ($const eq 'a'){
@@ -951,7 +951,7 @@
?,?,?,?,?)
/;
my $sth = $dbh->prepare($query);
- $sth->execute($borrnum,$biblionumber,$resdate,$branch,$const,$priority,$notes,$checkitem,$found,$waitingdate);
+ $sth->execute($borrowernumber,$biblionumber,$resdate,$branch,$const,$priority,$notes,$checkitem,$found,$waitingdate);
$sth->finish;
#}
if (($const eq "o") || ($const eq "e")) {
@@ -966,7 +966,7 @@
(?,?,?,?)
/;
my $sth = $dbh->prepare("");
- $sth->execute($borrnum,$biblionumber,$resdate,$biblioitem);
+ $sth->execute($borrowernumber,$biblionumber,$resdate,$biblioitem);
$sth->finish;
$i++;
}
@@ -980,7 +980,7 @@
# FIXME - opac-reserves.pl need to use it, temporarily put into @EXPORT
sub CalcReserveFee {
- my ($env,$borrnum,$biblionumber,$constraint,$bibitems) = @_;
+ my ($env,$borrowernumber,$biblionumber,$constraint,$bibitems) = @_;
#check for issues;
my $dbh = C4::Context->dbh;
my $const = lc substr($constraint,0,1);
@@ -990,7 +990,7 @@
AND borrowers.categorycode = categories.categorycode
/;
my $sth = $dbh->prepare($query);
- $sth->execute($borrnum);
+ $sth->execute($borrowernumber);
my $data = $sth->fetchrow_hashref;
$sth->finish();
my $fee = $data->{'reservefee'};
@@ -1071,12 +1071,12 @@
#
# All other item types should incur a reserve charge.
sub CalcHLTReserveFee {
- my ($env,$borrnum,$biblionumber,$constraint,$bibitems) = @_;
+ my ($env,$borrowernumber,$biblionumber,$constraint,$bibitems) = @_;
my $dbh = C4::Context->dbh;
my $sth = $dbh->prepare("SELECT * FROM borrowers,categories
WHERE (borrowernumber = ?)
AND (borrowers.categorycode = categories.categorycode)");
- $sth->execute($borrnum);
+ $sth->execute($borrowernumber);
my $data = $sth->fetchrow_hashref;
$sth->finish();
my $fee = $data->{'reservefee'};
@@ -1109,12 +1109,12 @@
=cut
sub GetNextAccountNumber {
- my ($env,$bornumber,$dbh)=@_;
+ my ($env,$borrowernumber,$dbh)=@_;
my $nextaccntno = 1;
my $sth = $dbh->prepare("select * from accountlines
where (borrowernumber = ?)
order by accountno desc");
- $sth->execute($bornumber);
+ $sth->execute($borrowernumber);
if (my $accdata=$sth->fetchrow_hashref){
$nextaccntno = $accdata->{'accountno'} + 1;
}
Index: C4/Search.pm
===================================================================
RCS file: /sources/koha/koha/C4/Search.pm,v
retrieving revision 1.120.2.27
retrieving revision 1.120.2.28
diff -u -b -r1.120.2.27 -r1.120.2.28
--- C4/Search.pm 17 Nov 2006 13:18:58 -0000 1.120.2.27
+++ C4/Search.pm 17 Nov 2006 14:57:21 -0000 1.120.2.28
@@ -39,7 +39,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.120.2.27 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.120.2.28 $' =~ /\d+/g;
shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
=head1 NAME
@@ -130,10 +130,10 @@
#'
sub findguarantees{
- my ($bornum)=@_;
+ my ($borrowernumber)=@_;
my $dbh = C4::Context->dbh;
my $sth=$dbh->prepare("select cardnumber,borrowernumber, firstname, surname from borrowers where guarantor=?");
- $sth->execute($bornum);
+ $sth->execute($borrowernumber);
my @dat;
while (my $data = $sth->fetchrow_hashref)
@@ -162,10 +162,10 @@
#'
sub findguarantor{
- my ($bornum)=@_;
+ my ($borrowernumber)=@_;
my $dbh = C4::Context->dbh;
my $sth=$dbh->prepare("select guarantor from borrowers where borrowernumber=?");
- $sth->execute($bornum);
+ $sth->execute($borrowernumber);
my $data=$sth->fetchrow_hashref;
$sth->finish;
$sth=$dbh->prepare("Select * from borrowers where borrowernumber=?");
Index: C4/Serials.pm
===================================================================
RCS file: /sources/koha/koha/C4/Serials.pm,v
retrieving revision 1.5.2.8
retrieving revision 1.5.2.9
diff -u -b -r1.5.2.8 -r1.5.2.9
--- C4/Serials.pm 17 Nov 2006 13:18:59 -0000 1.5.2.8
+++ C4/Serials.pm 17 Nov 2006 14:57:21 -0000 1.5.2.9
@@ -17,7 +17,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: Serials.pm,v 1.5.2.8 2006/11/17 13:18:59 tipaul Exp $
+# $Id: Serials.pm,v 1.5.2.9 2006/11/17 14:57:21 tipaul Exp $
use strict;
use C4::Date;
@@ -32,7 +32,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.5.2.8 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.5.2.9 $' =~ /\d+/g;
shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
@@ -1614,7 +1614,7 @@
=over 4
-&addroutingmember($bornum,$subscriptionid)
+&addroutingmember($borrowernumber,$subscriptionid)
this function takes a borrowernumber and subscriptionid and add the member to the
routing list for that serial subscription and gives them a rank on the list
@@ -1624,7 +1624,7 @@
=cut
sub addroutingmember {
- my ($bornum,$subscriptionid) = @_;
+ my ($borrowernumber,$subscriptionid) = @_;
my $rank;
my $dbh = C4::Context->dbh;
my $sth = $dbh->prepare("SELECT max(ranking) rank FROM subscriptionroutinglist WHERE subscriptionid = ?");
@@ -1637,7 +1637,7 @@
}
}
$sth = $dbh->prepare("INSERT INTO subscriptionroutinglist (subscriptionid,borrowernumber,ranking) VALUES (?,?,?)");
- $sth->execute($subscriptionid,$bornum,$rank);
+ $sth->execute($subscriptionid,$borrowernumber,$rank);
}
=head2 reorder_members
Index: C4/Circulation/Circ2.pm
===================================================================
RCS file: /sources/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.114.2.15
retrieving revision 1.114.2.16
diff -u -b -r1.114.2.15 -r1.114.2.16
--- C4/Circulation/Circ2.pm 17 Nov 2006 13:18:59 -0000 1.114.2.15
+++ C4/Circulation/Circ2.pm 17 Nov 2006 14:57:21 -0000 1.114.2.16
@@ -3,7 +3,7 @@
package C4::Circulation::Circ2;
-# $Id: Circ2.pm,v 1.114.2.15 2006/11/17 13:18:59 tipaul Exp $
+# $Id: Circ2.pm,v 1.114.2.16 2006/11/17 14:57:21 tipaul Exp $
#package to deal with Returns
#written 3/11/99 by olwen at katipo.co.nz
@@ -45,7 +45,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.114.2.15 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.114.2.16 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
=head1 NAME
@@ -1489,7 +1489,7 @@
sub checkoverdues {
# From Main.pm, modified to return a list of overdueitems, in addition to a count
#checks whether a borrower has overdue items
- my ($env, $bornum, $dbh)=@_;
+ my ($env, $borrowernumber, $dbh)=@_;
my @datearr = localtime;
my $today = ($datearr[5] + 1900)."-".($datearr[4]+1)."-".$datearr[3];
my @overdueitems;
@@ -1501,7 +1501,7 @@
AND issues.borrowernumber = ?
AND issues.returndate is NULL
AND issues.date_due < ?");
- $sth->execute($bornum,$today);
+ $sth->execute($borrowernumber,$today);
while (my $data = $sth->fetchrow_hashref) {
push (@overdueitems, $data);
$count++;
@@ -1811,7 +1811,7 @@
sub renewstatus {
# check renewal status
- my ($env,$bornum,$itemno)=@_;
+ my ($env,$borrowernumber,$itemno)=@_;
my $dbh = C4::Context->dbh;
my $renews = 1;
my $renewokay = 0;
@@ -1823,7 +1823,7 @@
where (borrowernumber = ?)
and (itemnumber = ?)
and returndate is null");
- $sth1->execute($bornum,$itemno);
+ $sth1->execute($borrowernumber,$itemno);
if (my $data1 = $sth1->fetchrow_hashref) {
# Found a matching item
@@ -1883,7 +1883,7 @@
sub renewbook {
# mark book as renewed
- my ($env,$bornum,$itemno,$datedue)=@_;
+ my ($env,$borrowernumber,$itemno,$datedue)=@_;
my $dbh = C4::Context->dbh;
# If the due date wasn't specified, calculate it by adding the
@@ -1891,7 +1891,7 @@
if ($datedue eq "" ) {
#debug_msg($env, "getting date");
my $iteminformation = getiteminformation($itemno,0);
- my $borrower = getpatroninformation($env,$bornum,0);
+ my $borrower = getpatroninformation($env,$borrowernumber,0);
my $loanlength = getLoanLength($borrower->{'categorycode'},$iteminformation->{'itemtype'},$borrower->{'branchcode'});
my ($due_year, $due_month, $due_day) = Add_Delta_DHMS(Today_and_Now(), $loanlength,0,0,0);
$datedue = "$due_year-$due_month-$due_day";
@@ -1900,7 +1900,7 @@
# Find the issues record for this book
my $sth=$dbh->prepare("select * from issues where borrowernumber=? and itemnumber=? and returndate is null");
- $sth->execute($bornum,$itemno);
+ $sth->execute($borrowernumber,$itemno);
my $issuedata=$sth->fetchrow_hashref;
$sth->finish;
@@ -1909,20 +1909,20 @@
my $renews = $issuedata->{'renewals'} +1;
$sth=$dbh->prepare("update issues set date_due = ?, renewals = ?
where borrowernumber=? and itemnumber=? and returndate is null");
- $sth->execute($datedue,$renews,$bornum,$itemno);
+ $sth->execute($datedue,$renews,$borrowernumber,$itemno);
$sth->finish;
# Log the renewal
UpdateStats($env,$env->{'branchcode'},'renew','','',$itemno);
# Charge a new rental fee, if applicable?
- my ($charge,$type)=calc_charges($env, $itemno, $bornum);
+ my ($charge,$type)=calc_charges($env, $itemno, $borrowernumber);
if ($charge > 0){
- my $accountno=getnextacctno($env,$bornum,$dbh);
+ my $accountno=getnextacctno($env,$borrowernumber,$dbh);
my $item=getiteminformation($itemno);
$sth=$dbh->prepare("Insert into accountlines (borrowernumber,accountno,date,amount,description,accounttype,amountoutstanding,itemnumber)
values (?,?,now(),?,?,?,?,?)");
- $sth->execute($bornum,$accountno,$charge,"Renewal of Rental Item $item->{'title'} $item->{'barcode'}",'Rent',$charge,$itemno);
+ $sth->execute($borrowernumber,$accountno,$charge,"Renewal of Rental Item $item->{'title'} $item->{'barcode'}",'Rent',$charge,$itemno);
$sth->finish;
# print $account;
}
@@ -1953,7 +1953,7 @@
sub calc_charges {
# calculate charges due
- my ($env, $itemno, $bornum)=@_;
+ my ($env, $itemno, $borrowernumber)=@_;
my $charge=0;
my $dbh = C4::Context->dbh;
my $item_type;
@@ -1972,7 +1972,7 @@
and (borrowers.categorycode = issuingrules.categorycode)
and (issuingrules.itemtype = ?)";
my $sth2=$dbh->prepare($q2);
- $sth2->execute($bornum,$item_type);
+ $sth2->execute($borrowernumber,$item_type);
if (my $data2=$sth2->fetchrow_hashref) {
my $discount = $data2->{'rentaldiscount'};
if ($discount eq 'NULL') {
@@ -1993,8 +1993,8 @@
# C4::Circulation::Issues. Pick one and stick with it.
sub createcharge {
#Stolen from Issues.pm
- my ($env,$dbh,$itemno,$bornum,$charge) = @_;
- my $nextaccntno = getnextacctno($env,$bornum,$dbh);
+ my ($env,$dbh,$itemno,$borrowernumber,$charge) = @_;
+ my $nextaccntno = getnextacctno($env,$borrowernumber,$dbh);
my $sth = $dbh->prepare(<<EOT);
INSERT INTO accountlines
(borrowernumber, itemnumber, accountno,
@@ -2004,7 +2004,7 @@
now(), ?, 'Rental', 'Rent',
?)
EOT
- $sth->execute($bornum, $itemno, $nextaccntno, $charge, $charge);
+ $sth->execute($borrowernumber, $itemno, $nextaccntno, $charge, $charge);
$sth->finish;
}
@@ -2286,19 +2286,19 @@
=cut
sub AddNotifyLine {
- my($bornum,$itemnumber,$overduelevel,$method,$notifyId) = @_;
+ my($borrowernumber,$itemnumber,$overduelevel,$method,$notifyId) = @_;
if ( $method eq "phone") {
my $dbh = C4::Context->dbh;
my $sth=$dbh->prepare("INSERT INTO notifys (borrowernumber,itemnumber,notify_date,notify_send_date,notify_level,method,notify_id)
VALUES (?,?,now(),now(),?,?,?)");
- $sth->execute($bornum,$itemnumber,$overduelevel,$method,$notifyId);
+ $sth->execute($borrowernumber,$itemnumber,$overduelevel,$method,$notifyId);
$sth->finish;
}
else {
my $dbh = C4::Context->dbh;
my $sth=$dbh->prepare("INSERT INTO notifys (borrowernumber,itemnumber,notify_date,notify_level,method,notify_id)
VALUES (?,?,now(),?,?,?)");
- $sth->execute($bornum,$itemnumber,$overduelevel,$method,$notifyId);
+ $sth->execute($borrowernumber,$itemnumber,$overduelevel,$method,$notifyId);
$sth->finish;
}
return 1;
@@ -2311,14 +2311,14 @@
=cut
sub RemoveNotifyLine {
- my($bornum,$itemnumber,$notify_date) = @_;
+ my($borrowernumber,$itemnumber,$notify_date) = @_;
my $dbh = C4::Context->dbh;
my $sth=$dbh->prepare("DELETE FROM notifys
WHERE
borrowernumber=?
AND itemnumber=?
AND notify_date=?");
- $sth->execute($bornum,$itemnumber,$notify_date);
+ $sth->execute($borrowernumber,$itemnumber,$notify_date);
$sth->finish;
return 1;
}
Index: C4/Circulation/Fines.pm
===================================================================
RCS file: /sources/koha/koha/C4/Circulation/Fines.pm,v
retrieving revision 1.14.2.5
retrieving revision 1.14.2.6
diff -u -b -r1.14.2.5 -r1.14.2.6
--- C4/Circulation/Fines.pm 14 Nov 2006 15:03:07 -0000 1.14.2.5
+++ C4/Circulation/Fines.pm 17 Nov 2006 14:57:21 -0000 1.14.2.6
@@ -1,6 +1,6 @@
package C4::Circulation::Fines;
-# $Id: Fines.pm,v 1.14.2.5 2006/11/14 15:03:07 toins Exp $
+# $Id: Fines.pm,v 1.14.2.6 2006/11/17 14:57:21 tipaul Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -29,7 +29,7 @@
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.14.2.5 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.14.2.6 $' =~ /\d+/g;
shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
=head1 NAME
@@ -363,7 +363,7 @@
# be on loan to two different people, so the item number should be
# sufficient.
sub UpdateFine {
- my ( $itemnum, $bornum, $amount, $type, $due ) = @_;
+ my ( $itemnum, $borrowernumber, $amount, $type, $due ) = @_;
my $dbh = C4::Context->dbh;
# FIXME - What exactly is this query supposed to do? It looks up an
@@ -377,7 +377,7 @@
borrowernumber=? and (accounttype='FU' or accounttype='O' or
accounttype='F' or accounttype='M') and description like ?"
);
- $sth->execute( $itemnum, $bornum, "%$due%" );
+ $sth->execute( $itemnum, $borrowernumber, "%$due%" );
if ( my $data = $sth->fetchrow_hashref ) {
@@ -425,14 +425,14 @@
# $sth3->finish;
# $accountno[0]++;
# begin transaction
- my $nextaccntno = getnextacctno(undef,$bornum,$dbh);
+ my $nextaccntno = getnextacctno(undef,$borrowernumber,$dbh);
my $sth2 = $dbh->prepare(
"Insert into accountlines
(borrowernumber,itemnumber,date,amount,
description,accounttype,amountoutstanding,accountno) values
(?,?,now(),?,?,'FU',?,?)"
);
- $sth2->execute( $bornum, $itemnum, $amount,
+ $sth2->execute( $borrowernumber, $itemnum, $amount,
"$type $title->{'title'} $due",
$amount, $nextaccntno);
$sth2->finish;
@@ -492,25 +492,25 @@
=item GetFine
-$data->{'sum(amountoutstanding)'} = &GetFine($itemnum,$bornum);
+$data->{'sum(amountoutstanding)'} = &GetFine($itemnum,$borrowernumber);
return the total of fine
C<$itemnum> is item number
-C<$bornum> is the borrowernumber
+C<$borrowernumber> is the borrowernumber
=cut
sub GetFine {
- my ( $itemnum, $bornum ) = @_;
+ my ( $itemnum, $borrowernumber ) = @_;
my $dbh = C4::Context->dbh();
my $query = "SELECT sum(amountoutstanding) FROM accountlines
where accounttype like 'F%'
AND amountoutstanding > 0 AND itemnumber = ? AND borrowernumber=?";
my $sth = $dbh->prepare($query);
- $sth->execute( $itemnum, $bornum );
+ $sth->execute( $itemnum, $borrowernumber );
my $data = $sth->fetchrow_hashref();
$sth->finish();
$dbh->disconnect();
@@ -558,7 +558,7 @@
sub ReplacementCost2 {
- my ( $itemnum, $bornum ) = @_;
+ my ( $itemnum, $borrowernumber ) = @_;
my $dbh = C4::Context->dbh();
my $query = "SELECT amountoutstanding
FROM accountlines
@@ -567,7 +567,7 @@
AND itemnumber = ?
AND borrowernumber= ?";
my $sth = $dbh->prepare($query);
- $sth->execute( $itemnum, $bornum );
+ $sth->execute( $itemnum, $borrowernumber );
my $data = $sth->fetchrow_hashref();
$sth->finish();
$dbh->disconnect();
@@ -620,7 +620,7 @@
=item AmountNotify
-(@notify) = &AmountNotify($bornum);
+(@notify) = &AmountNotify($borrowernumber);
Returns amount for all file per borrowers
C<@notify> array contains all file per borrowers
@@ -629,7 +629,7 @@
=cut
sub NumberNotifyId{
- my ($bornum)=@_;
+ my ($borrowernumber)=@_;
my $dbh = C4::Context->dbh;
my $env;
my $query=qq| SELECT distinct(notify_id)
@@ -637,7 +637,7 @@
WHERE borrowernumber=?|;
my @notify;
my $sth=$dbh->prepare($query);
- $sth->execute($bornum);
+ $sth->execute($borrowernumber);
while ( my $numberofotify=$sth->fetchrow_array){
push (@notify,$numberofotify);
}
Index: C4/Circulation/Returns.pm
===================================================================
RCS file: /sources/koha/koha/C4/Circulation/Attic/Returns.pm,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -b -r1.10.2.1 -r1.10.2.2
--- C4/Circulation/Returns.pm 10 Nov 2006 09:43:33 -0000 1.10.2.1
+++ C4/Circulation/Returns.pm 17 Nov 2006 14:57:21 -0000 1.10.2.2
@@ -1,6 +1,6 @@
package C4::Circulation::Returns;
-# $Id: Returns.pm,v 1.10.2.1 2006/11/10 09:43:33 btoumi Exp $
+# $Id: Returns.pm,v 1.10.2.2 2006/11/17 14:57:21 tipaul Exp $
#package to deal with Returns
#written 3/11/99 by olwen at katipo.co.nz
@@ -65,7 +65,7 @@
my $borrower;
my $itemno;
my $itemrec;
- my $bornum;
+ my $borrowernumber;
my $amt_owing;
my $odues;
my $issues;
@@ -79,10 +79,10 @@
#if (($reason ne "Circ") && ($reason ne "Quit")) {
if ($reason eq "") {
$resp = "";
- ($resp,$bornum,$borrower,$itemno,$itemrec,$amt_owing) =
+ ($resp,$borrowernumber,$borrower,$itemno,$itemrec,$amt_owing) =
checkissue($env,$dbh,$item);
- if ($bornum ne "") {
- ($issues,$odues,$amt_owing) = borrdata2($env,$bornum);
+ if ($borrowernumber ne "") {
+ ($issues,$odues,$amt_owing) = borrdata2($env,$borrowernumber);
} else {
$issues = "";
$odues = "";
@@ -105,7 +105,7 @@
#}
#if ($resp ne "Returned") {
# error_msg($env,"$resp");
- # $bornum = "";
+ # $borrowernumber = "";
#}
}
}
@@ -120,7 +120,7 @@
sub checkissue {
my ($env,$dbh, $item) = @_;
my $reason='Circ';
- my $bornum;
+ my $borrowernumber;
my $borrower;
my $itemno;
my $itemrec;
@@ -142,11 +142,11 @@
my $sth= $dbh->prepare("select * from borrowers where
(borrowernumber = ?)");
$sth->execute($issuerec->{'borrowernumber'});
- $env->{'bornum'}=$issuerec->{'borrowernumber'};
+ $env->{'borrowernumber'}=$issuerec->{'borrowernumber'};
$borrower = $sth->fetchrow_hashref;
- $bornum = $issuerec->{'borrowernumber'};
+ $borrowernumber = $issuerec->{'borrowernumber'};
$itemno = $issuerec->{'itemnumber'};
- $amt_owing = returnrecord($env,$dbh,$bornum,$itemno);
+ $amt_owing = returnrecord($env,$dbh,$borrowernumber,$itemno);
$reason = "Returned";
} else {
$sth->finish;
@@ -168,7 +168,7 @@
$sth->finish;
$reason = "Item not found";
}
- return ($reason,$bornum,$borrower,$itemno,$itemrec,$amt_owing);
+ return ($reason,$borrowernumber,$borrower,$itemno,$itemrec,$amt_owing);
# end checkissue
}
@@ -178,14 +178,14 @@
# Otherwise, it needs a POD.
sub returnrecord {
# mark items as returned
- my ($env,$dbh,$bornum,$itemno)=@_;
- #my $amt_owing = calc_odues($env,$dbh,$bornum,$itemno);
+ my ($env,$dbh,$borrowernumber,$itemno)=@_;
+ #my $amt_owing = calc_odues($env,$dbh,$borrowernumber,$itemno);
my @datearr = localtime(time);
my $dateret = (1900+$datearr[5])."-".$datearr[4]."-".$datearr[3];
my $sth = $dbh->prepare("update issues set returndate = now(), branchcode = ? where
(borrowernumber = ?) and (itemnumber = ?)
and (returndate is null)");
- $sth->execute($env->{'branchcode'},$bornum,$itemno);
+ $sth->execute($env->{'branchcode'},$borrowernumber,$itemno);
$sth->finish;
updatelastseen($env,$dbh,$itemno);
# check for overdue fine
@@ -194,7 +194,7 @@
where (borrowernumber = ?)
and (itemnumber = ?)
and (accounttype = 'FU' or accounttype='O')");
- $sth->execute($bornum,$itemno);
+ $sth->execute($borrowernumber,$itemno);
if (my $data = $sth->fetchrow_hashref) {
# alter fine to show that the book has been returned.
my $usth = $dbh->prepare("update accountlines
@@ -202,7 +202,7 @@
where (borrowernumber = ?)
and (itemnumber = ?)
and (accountno = ?) ");
- $usth->execute($bornum,$itemno,$data->{'accountno'});
+ $usth->execute($borrowernumber,$itemno,$data->{'accountno'});
$usth->finish();
$oduecharge = $data->{'amountoutstanding'};
}
@@ -212,7 +212,7 @@
where (borrowernumber = ?)
and (itemnumber = ?)
and (accounttype = 'L')");
- $sth->execute($bornum,$itemno);
+ $sth->execute($borrowernumber,$itemno);
if (my $data = $sth->fetchrow_hashref) {
# writeoff this amount
my $offset;
@@ -231,19 +231,19 @@
where (borrowernumber = ?)
and (itemnumber = ?)
and (accountno = ?) ");
- $usth->execute($bornum,$itemno,$acctno);
+ $usth->execute($borrowernumber,$itemno,$acctno);
$usth->finish;
- my $nextaccntno = C4::Accounts::getnextacctno($env,$bornum,$dbh);
+ my $nextaccntno = C4::Accounts::getnextacctno($env,$borrowernumber,$dbh);
$usth = $dbh->prepare("insert into accountlines
(borrowernumber,accountno,date,amount,description,accounttype,amountoutstanding)
values (?,?,now(),?,'Book Returned','CR',?)");
- $usth->execute($bornum,$nextaccntno,0-$amount,$amountleft);
+ $usth->execute($borrowernumber,$nextaccntno,0-$amount,$amountleft);
$usth->finish;
$uquery = "insert into accountoffsets
(borrowernumber, accountno, offsetaccount, offsetamount)
values (?,?,?,?)";
$usth = $dbh->prepare("");
- $usth->execute($bornum,$data->{'accountno'},$nextaccntno,$offset);
+ $usth->execute($borrowernumber,$data->{'accountno'},$nextaccntno,$offset);
$usth->finish;
}
$sth->finish;
@@ -256,7 +256,7 @@
# Otherwise, it needs a POD.
sub calc_odues {
# calculate overdue fees
- my ($env,$dbh,$bornum,$itemno)=@_;
+ my ($env,$dbh,$borrowernumber,$itemno)=@_;
my $amt_owing;
return($amt_owing);
}
Index: circ/branchoverdues.pl
===================================================================
RCS file: /sources/koha/koha/circ/Attic/branchoverdues.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- circ/branchoverdues.pl 3 Nov 2006 10:17:55 -0000 1.1.2.2
+++ circ/branchoverdues.pl 17 Nov 2006 14:57:21 -0000 1.1.2.3
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: branchoverdues.pl,v 1.1.2.2 2006/11/03 10:17:55 toins Exp $
+# $Id: branchoverdues.pl,v 1.1.2.3 2006/11/17 14:57:21 tipaul Exp $
#
# This file is part of Koha.
#
@@ -85,7 +85,7 @@
# Deal with the vars recept from the template
-my $bornum=$input->param('bornum');
+my $borrowernumber=$input->param('borrowernumber');
my $itemnumber=$input->param('itemnumber');
my $method=$input->param('method');
my $overduelevel=$input->param('overduelevel');
@@ -93,13 +93,13 @@
# now create the line in bdd (notifys)
if($input->param('action') eq 'add'){
- my $addnotify = AddNotifyLine($bornum,$itemnumber,$overduelevel,$method,$notifyId);
+ my $addnotify = AddNotifyLine($borrowernumber,$itemnumber,$overduelevel,$method,$notifyId);
}
# possibility to remove notify line
if($input->param('action') eq 'remove'){
my $notify_date=$input->param('notify_date');
- my $removenotify = RemoveNotifyLine($bornum,$itemnumber,$notify_date);
+ my $removenotify = RemoveNotifyLine($borrowernumber,$itemnumber,$notify_date);
}
my @overduesloop;
Index: circ/branchtransfers.pl
===================================================================
RCS file: /sources/koha/koha/circ/branchtransfers.pl,v
retrieving revision 1.24.2.2
retrieving revision 1.24.2.3
diff -u -b -r1.24.2.2 -r1.24.2.3
--- circ/branchtransfers.pl 17 Oct 2006 09:53:19 -0000 1.24.2.2
+++ circ/branchtransfers.pl 17 Nov 2006 14:57:21 -0000 1.24.2.3
@@ -66,7 +66,7 @@
my $allmessages;
my $request=$query->param('request');
-my $borrnum = $query->param('borrowernumber');
+my $borrowernumber = $query->param('borrowernumber');
my $tobranchcd=$query->param('tobranchcd');
my $frbranchcd='';
@@ -75,7 +75,7 @@
# Deal with the requests....
if ($request eq "KillWaiting") {
my $item = $query->param('itemnumber');
- CancelReserve(0, $item, $borrnum);
+ CancelReserve(0, $item, $borrowernumber);
$cancelled = 1;
$reqmessage =1;
$allmessages = 1;
@@ -84,7 +84,7 @@
my $ignoreRs = 0;
if ($request eq "SetWaiting") {
my $item = $query->param('itemnumber');
- $tobranchcd = ReserveWaiting($item, $borrnum);
+ $tobranchcd = ReserveWaiting($item, $borrowernumber);
$reqbrchname = $branches->{$tobranchcd}->{'branchname'};
$ignoreRs = 1;
$setwaiting = 1;
@@ -93,7 +93,7 @@
}
if ($request eq 'KillReserved'){
my $biblio = $query->param('biblionumber');
- CancelReserve($biblio, 0, $borrnum);
+ CancelReserve($biblio, 0, $borrowernumber);
$cancelled = 1;
$reqmessage =1;
$allmessages = 1;
@@ -189,13 +189,13 @@
my $title;
my $surname;
my $firstname;
-my $bornum;
+my $borrowernumber;
my $borphone;
my $borstraddress;
my $borcity;
my $borzip;
my $boremail;
-my $bornum;
+my $borrowernumber;
my $borcnum;
my $itemnumber;
my $biblionum;
@@ -212,7 +212,7 @@
$title = $borr->{'title'};
$surname = $borr->{'surname'};
$firstname = $borr->{'firstname'};
- $bornum = $borr->{'borrowernumber'};
+ $borrowernumber = $borr->{'borrowernumber'};
$borphone = $borr->{'phone'};
$borstraddress = $borr->{'streetaddress'};
$borcity = $borr->{'city'};
@@ -260,7 +260,7 @@
$title = $borrowerinfo->{'title'};
$surname = $borrowerinfo->{'surname'};
$firstname = $borrowerinfo->{'firstname'};
- $bornum =$borrowerinfo->{'borrowernumber'};
+ $borrowernumber =$borrowerinfo->{'borrowernumber'};
$borcnum =$borrowerinfo->{'cardnumber'};
}
# if ($code eq 'WasTransfered'){
@@ -298,7 +298,7 @@
borcity => $borcity,
borzip => $borzip,
boremail => $boremail,
- bornum => $bornum,
+ borrowernumber => $borrowernumber,
borcnum => $borcnum,
branchname => $branchname,
itemnumber => $itemnumber,
Index: circ/circulation.pl
===================================================================
RCS file: /sources/koha/koha/circ/circulation.pl,v
retrieving revision 1.97.2.5
retrieving revision 1.97.2.6
diff -u -b -r1.97.2.5 -r1.97.2.6
--- circ/circulation.pl 2 Nov 2006 14:06:22 -0000 1.97.2.5
+++ circ/circulation.pl 17 Nov 2006 14:57:21 -0000 1.97.2.6
@@ -64,7 +64,7 @@
my $findborrower = $query->param('findborrower');
$findborrower =~ s|,| |g;
$findborrower =~ s|'| |g;
-my $borrowernumber = $query->param('borrnumber');
+my $borrowernumber = $query->param('borrowernumberber');
# new op dev the branch and the printer are now defined by the userenv
my $branch = C4::Context->userenv->{'branch'};
my $printer=C4::Context->userenv->{'branchprinter'};
@@ -114,12 +114,12 @@
if ($barcode eq '' && $query->param('charges') eq 'yes'){
$template->param( PAYCHARGES=>'yes',
- bornum=>$borrowernumber);
+ borrowernumber=>$borrowernumber);
}
if ( $print eq 'yes' && $borrowernumber ne '' ) {
printslip( \%env, $borrowernumber );
- $query->param( 'borrnumber', '' );
+ $query->param( 'borrowernumberber', '' );
$borrowernumber = '';
}
@@ -138,7 +138,7 @@
$message = "'$findborrower'";
}
elsif ( $#borrowers == 0 ) {
- $query->param( 'borrnumber', $borrowers[0]->{'borrowernumber'} );
+ $query->param( 'borrowernumberber', $borrowers[0]->{'borrowernumber'} );
$query->param( 'barcode', '' );
$borrowernumber = $borrowers[0]->{'borrowernumber'};
}
@@ -445,7 +445,7 @@
push @values, $_->{'borrowernumber'};
$labels{$_->{'borrowernumber'}} ="$_->{'surname'}, $_->{'firstname'} ... ($_->{'cardnumber'} - $_->{'categorycode'}) ... $_->{'address'} ";
}
- $CGIselectborrower=CGI::scrolling_list( -name => 'borrnumber',
+ $CGIselectborrower=CGI::scrolling_list( -name => 'borrowernumberber',
-values => \@values,
-labels => \%labels,
-size => 7,
Index: circ/reserve.pl
===================================================================
RCS file: /sources/koha/koha/circ/reserve.pl,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -b -r1.3.2.1 -r1.3.2.2
--- circ/reserve.pl 3 Oct 2006 13:19:53 -0000 1.3.2.1
+++ circ/reserve.pl 17 Nov 2006 14:57:21 -0000 1.3.2.2
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: reserve.pl,v 1.3.2.1 2006/10/03 13:19:53 toins Exp $
+# $Id: reserve.pl,v 1.3.2.2 2006/11/17 14:57:21 tipaul Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -56,7 +56,7 @@
# timestamp timestamp ON UPDATE CURRENT_TIMESTAMP Oui CURRENT_TIMESTAMP Modifier Supprimer Primaire Index Unique Texte entier
# itemnumber int(11)
my $duedate;
-my $bornum;
+my $borrowernumber;
my $itemnum;
my $data1;
my $data2;
@@ -71,9 +71,9 @@
my $todaysdate = (1900+$datearr[5]).'-'.sprintf ("%0.2d", ($datearr[4]+1)).'-'.sprintf ("%0.2d", $datearr[3]);
my $dbh = C4::Context->dbh;
-my $strsth="select reservedate,reserves.borrowernumber as bornum, concat(firstname,' ',surname) as borrower, borrowers.phone, borrowers.emailaddress,reserves.biblionumber, reserves.branchcode as branch, items.holdingbranch, items.itemcallnumber, items.itemnumber, notes, notificationdate, reminderdate, priority, reserves.found, biblio.title, biblio.author from reserves left join items on items.itemnumber=reserves.itemnumber, borrowers,biblio where isnull(cancellationdate) && reserves.borrowernumber=borrowers.borrowernumber && reserves.biblionumber=biblio.biblionumber order by reservedate, borrower ";
-$strsth="select reservedate,reserves.borrowernumber as bornum,concat(firstname,' ',surname) as borrower, borrowers.phone, borrowers.emailaddress,reserves.biblionumber, reserves.branchcode as branch, items.holdingbranch, items.itemcallnumber, items.itemnumber, notes, notificationdate, reminderdate, priority, reserves.found, biblio.title, biblio.author from reserves left join items on items.itemnumber=reserves.itemnumber , borrowers,biblio where isnull(cancellationdate) && reserves.borrowernumber=borrowers.borrowernumber && reserves.biblionumber=biblio.biblionumber order by borrower,reservedate " if ($order eq "borrower");
-$strsth="select reservedate,reserves.borrowernumber as bornum,concat(firstname,' ',surname) as borrower, borrowers.phone, borrowers.emailaddress,reserves.biblionumber, reserves.branchcode as branch, items.holdingbranch, items.itemcallnumber, items.itemnumber, notes, notificationdate, reminderdate, priority, reserves.found, biblio.title, biblio.author from reserves left join items on items.itemnumber=reserves.itemnumber, borrowers,biblio where isnull(cancellationdate) && reserves.borrowernumber=borrowers.borrowernumber && reserves.biblionumber=biblio.biblionumber order by biblio.title, priority,reservedate " if ($order eq "biblio");
+my $strsth="select reservedate,reserves.borrowernumber as borrowernumber, concat(firstname,' ',surname) as borrower, borrowers.phone, borrowers.emailaddress,reserves.biblionumber, reserves.branchcode as branch, items.holdingbranch, items.itemcallnumber, items.itemnumber, notes, notificationdate, reminderdate, priority, reserves.found, biblio.title, biblio.author from reserves left join items on items.itemnumber=reserves.itemnumber, borrowers,biblio where isnull(cancellationdate) && reserves.borrowernumber=borrowers.borrowernumber && reserves.biblionumber=biblio.biblionumber order by reservedate, borrower ";
+$strsth="select reservedate,reserves.borrowernumber as borrowernumber,concat(firstname,' ',surname) as borrower, borrowers.phone, borrowers.emailaddress,reserves.biblionumber, reserves.branchcode as branch, items.holdingbranch, items.itemcallnumber, items.itemnumber, notes, notificationdate, reminderdate, priority, reserves.found, biblio.title, biblio.author from reserves left join items on items.itemnumber=reserves.itemnumber , borrowers,biblio where isnull(cancellationdate) && reserves.borrowernumber=borrowers.borrowernumber && reserves.biblionumber=biblio.biblionumber order by borrower,reservedate " if ($order eq "borrower");
+$strsth="select reservedate,reserves.borrowernumber as borrowernumber,concat(firstname,' ',surname) as borrower, borrowers.phone, borrowers.emailaddress,reserves.biblionumber, reserves.branchcode as branch, items.holdingbranch, items.itemcallnumber, items.itemnumber, notes, notificationdate, reminderdate, priority, reserves.found, biblio.title, biblio.author from reserves left join items on items.itemnumber=reserves.itemnumber, borrowers,biblio where isnull(cancellationdate) && reserves.borrowernumber=borrowers.borrowernumber && reserves.biblionumber=biblio.biblionumber order by biblio.title, priority,reservedate " if ($order eq "biblio");
my $sth=$dbh->prepare($strsth);
warn "".$strsth;
$sth->execute();
@@ -87,7 +87,7 @@
name => $data->{borrower},
title => $data->{title},
author => $data->{author},
- bornum => $data->{bornum},
+ borrowernumber => $data->{borrowernumber},
itemnum => $data->{itemnumber},
phone => $data->{phone},
email => $data->{email},
Index: circ/returns.pl
===================================================================
RCS file: /sources/koha/koha/circ/returns.pl,v
retrieving revision 1.43.2.4
retrieving revision 1.43.2.5
diff -u -b -r1.43.2.4 -r1.43.2.5
--- circ/returns.pl 10 Nov 2006 09:47:50 -0000 1.43.2.4
+++ circ/returns.pl 17 Nov 2006 14:57:21 -0000 1.43.2.5
@@ -99,7 +99,7 @@
$input{counter} = $counter;
$input{barcode} = $barcode;
$input{duedate} = $duedate;
- $input{bornum} = $borrowernumber;
+ $input{borrowernumber} = $borrowernumber;
push ( @inputloop, \%input );
}
@@ -107,12 +107,12 @@
# Deal with the requests....
if ( $query->param('resbarcode') ) {
my $item = $query->param('itemnumber');
- my $borrnum = $query->param('borrowernumber');
+ my $borrowernumber = $query->param('borrowernumber');
my $resbarcode = $query->param('resbarcode');
# set to waiting....
my $iteminfo = getiteminformation($item );
- my $tobranchcd = ReserveWaiting( $item, $borrnum );
+ my $tobranchcd = ReserveWaiting( $item, $borrowernumber );
# if($iteminfo->{'holdingbranch'} ne $branch){
# UpdateHoldingbranch($branch,$item);
# }
@@ -136,7 +136,7 @@
iteminfo => $iteminfo->{'author'},
tobranchname => $branchname,
name => $name,
- bornum => $borrnum,
+ borrowernumber => $borrowernumber,
borcnum => $borcnum,
borfirstname => $borr->{'firstname'},
borsurname => $borr->{'surname'},
@@ -166,7 +166,7 @@
$input{first} = 1;
$input{barcode} = $barcode;
$input{duedate} = $riduedate{0};
- $input{bornum} = $riborrowernumber{0};
+ $input{borrowernumber} = $riborrowernumber{0};
push ( @inputloop, \%input );
# check if the branch is the same as homebranch
# if not, we want to put a message
@@ -185,11 +185,11 @@
$riduedate{0} = 0;
if ( $messages->{'wthdrawn'} ) {
$input{withdrawn} = 1;
- $input{bornum} = "Item Cancelled";
+ $input{borrowernumber} = "Item Cancelled";
$riborrowernumber{0} = 'Item Cancelled';
}
else {
- $input{bornum} = " ";
+ $input{borrowernumber} = " ";
$riborrowernumber{0} = ' ';
}
push ( @inputloop, \%input );
@@ -261,7 +261,7 @@
borstraddress => $borr->{'streetaddress'},
borcity => $borr->{'city'},
borzip => $borr->{'zipcode'},
- bornum => $res->{'borrowernumber'},
+ borrowernumber => $res->{'borrowernumber'},
borcnum => $borr->{'cardnumber'},
debarred => $borr->{'debarred'},
gonenoaddress => $borr->{'gonenoaddress'},
@@ -310,7 +310,7 @@
borsurname => $borr->{'surname'},
bortitle => $borr->{'title'},
borfirstname => $borr->{'firstname'},
- bornum => $res->{'borrowernumber'},
+ borrowernumber => $res->{'borrowernumber'},
borcnum => $borr->{'cardnumber'},
borphone => $borr->{'phone'},
borstraddress => $borr->{'streetaddress'},
@@ -391,7 +391,7 @@
if ( $flag eq 'CHARGES' ) {
$flaginfo{msg} = $flag;
$flaginfo{charges} = 1;
- $flaginfo{bornum} = $borrower->{borrowernumber};
+ $flaginfo{borrowernumber} = $borrower->{borrowernumber};
}
elsif ( $flag eq 'WAITING' ) {
$flaginfo{msg} = $flag;
@@ -442,7 +442,7 @@
$template->param(
flagset => $flagset,
flagloop => \@flagloop,
- ribornum => $borrower->{'borrowernumber'},
+ riborrowernumber => $borrower->{'borrowernumber'},
riborcnum => $borrower->{'cardnumber'},
riborsurname => $borrower->{'surname'},
ribortitle => $borrower->{'title'},
@@ -480,14 +480,14 @@
$ri{duedate}=format_date($duedate);
my ($borrower) =
getpatroninformation( \%env, $riborrowernumber{$_}, 0 );
- $ri{bornum} = $borrower->{'borrowernumber'};
+ $ri{borrowernumber} = $borrower->{'borrowernumber'};
$ri{borcnum} = $borrower->{'cardnumber'};
$ri{borfirstname} = $borrower->{'firstname'};
$ri{borsurname} = $borrower->{'surname'};
$ri{bortitle} = $borrower->{'title'};
}
else {
- $ri{bornum} = $riborrowernumber{$_};
+ $ri{borrowernumber} = $riborrowernumber{$_};
}
# my %ri;
my ($iteminformation) = getiteminformation( 0, $barcode );
Index: koha-tmpl/intranet-tmpl/prog/en/admin/viewlog.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/viewlog.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- koha-tmpl/intranet-tmpl/prog/en/admin/viewlog.tmpl 24 Feb 2006 11:18:17 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/en/admin/viewlog.tmpl 17 Nov 2006 14:57:21 -0000 1.1.2.1
@@ -76,7 +76,7 @@
<!-- TMPL_VAR NAME="rowtitle" --></td>
<!-- TMPL_LOOP NAME="loopcell" -->
<!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td ><!-- /TMPL_IF -->
- <!-- TMPL_IF NAME="reference" --><a href="javascript:Dopop('../members/moremember.pl?bornum=<!-- TMPL_VAR NAME="reference" -->')" ><!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="reference" --><a href="javascript:Dopop('../members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="reference" -->')" ><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="reference" --></a><!-- /TMPL_IF -->
</td>
Index: koha-tmpl/intranet-tmpl/prog/en/catalogue/detail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/detail.tmpl,v
retrieving revision 1.2.2.8
retrieving revision 1.2.2.9
diff -u -b -r1.2.2.8 -r1.2.2.9
--- koha-tmpl/intranet-tmpl/prog/en/catalogue/detail.tmpl 17 Nov 2006 11:18:30 -0000 1.2.2.8
+++ koha-tmpl/intranet-tmpl/prog/en/catalogue/detail.tmpl 17 Nov 2006 14:57:22 -0000 1.2.2.9
@@ -163,7 +163,7 @@
<td><!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_IF NAME="itemcallnumber" --> <!-- TMPL_VAR NAME="itemcallnumber" --><!-- /TMPL_IF --></td>
<td>
<!-- TMPL_IF name="datedue" -->
- On issue to <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="cardnumber" --></a>
+ On issue to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="cardnumber" --></a>
<!-- TMPL_ELSE -->
<!-- TMPL_VAR name="notforloan" -->
<!-- /TMPL_IF -->
Index: koha-tmpl/intranet-tmpl/prog/en/catalogue/issuehistory.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/Attic/issuehistory.tmpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- koha-tmpl/intranet-tmpl/prog/en/catalogue/issuehistory.tmpl 17 Nov 2006 11:18:30 -0000 1.1.2.4
+++ koha-tmpl/intranet-tmpl/prog/en/catalogue/issuehistory.tmpl 17 Nov 2006 14:57:22 -0000 1.1.2.5
@@ -84,7 +84,7 @@
</td>
<td>
<!-- TMPL_IF NAME="surname" -->
- <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->">
+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">
<!-- TMPL_VAR NAME="surname" -->
</a>
<!-- TMPL_ELSE -->
Index: koha-tmpl/intranet-tmpl/prog/en/catalogue/moredetail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/moredetail.tmpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- koha-tmpl/intranet-tmpl/prog/en/catalogue/moredetail.tmpl 17 Nov 2006 11:18:30 -0000 1.1.2.4
+++ koha-tmpl/intranet-tmpl/prog/en/catalogue/moredetail.tmpl 17 Nov 2006 14:57:22 -0000 1.1.2.5
@@ -52,7 +52,7 @@
<b>Current Branch:</b> <!-- TMPL_VAR NAME="holdingbranch" --><br>
<b>Last seen:</b> <!-- TMPL_VAR NAME="datelastseen" --><br>
<b>Last borrowed:</b> <!-- TMPL_VAR NAME="datelastborrowed" --><br>
- <b>Item Status:</b> <!-- TMPL_IF NAME="issue" -->On issue to <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="cardnumber" --></a><!-- TMPL_ELSE -->Available <!-- /TMPL_IF --><br>
+ <b>Item Status:</b> <!-- TMPL_IF NAME="issue" -->On issue to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="cardnumber" --></a><!-- TMPL_ELSE -->Available <!-- /TMPL_IF --><br>
<!-- TMPL_IF NAME="issue" --><b>Date Due:</b> <!-- TMPL_VAR NAME="date_due" --><br><!-- /TMPL_IF -->
<b>Last Borrower 1:</b> <!-- TMPL_VAR NAME="card0" --><br>
<b>Last Borrower 2:</b> <!-- TMPL_VAR NAME="card1" --><br>
Index: koha-tmpl/intranet-tmpl/prog/en/circ/branchoverdues.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/Attic/branchoverdues.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- koha-tmpl/intranet-tmpl/prog/en/circ/branchoverdues.tmpl 17 Nov 2006 11:18:30 -0000 1.1.2.3
+++ koha-tmpl/intranet-tmpl/prog/en/circ/branchoverdues.tmpl 17 Nov 2006 14:57:22 -0000 1.1.2.4
@@ -64,7 +64,7 @@
</p>
</td>
<td>
- <p><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!--TMPL_VAR Name="borrowernumber"-->"><!-- TMPL_VAR NAME="borrowersurname" --> <!-- TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR NAME="borrowerphone" --><br />
+ <p><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR Name="borrowernumber"-->"><!-- TMPL_VAR NAME="borrowersurname" --> <!-- TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR NAME="borrowerphone" --><br />
<!-- TMPL_IF NAME="borroweremail" --><a href="mailto:<!-- TMPL_VAR NAME="borroweremail" -->?subject=Overdue: <!-- TMPL_VAR NAME="title" -->">
<!-- TMPL_VAR NAME="borroweremail" --></a><!--/TMPL_IF-->
</p>
@@ -87,24 +87,24 @@
<td align="center">
<!-- TMPL_IF NAME="overdue1" -->
<!-- TMPL_IF NAME="borroweremail" -->
- <a href="branchoverdues.pl?action=add&bornum=<!-- TMPL_VAR NAME="borrowernumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&method=mail&departement=<!-- TMPL_VAR NAME="departementValue" -->&overduelevel=<!-- TMPL_VAR NAME="overdueLevel" -->¬ifyId=<!-- TMPL_VAR NAME="notify_id" -->">mail</a>
+ <a href="branchoverdues.pl?action=add&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&method=mail&departement=<!-- TMPL_VAR NAME="departementValue" -->&overduelevel=<!-- TMPL_VAR NAME="overdueLevel" -->¬ifyId=<!-- TMPL_VAR NAME="notify_id" -->">mail</a>
<!-- TMPL_ELSE -->
mail
<!-- /TMPL_IF -->
|
- <a href="branchoverdues.pl?action=add&bornum=<!-- TMPL_VAR NAME="borrowernumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&method=phone&departement=<!-- TMPL_VAR NAME="departementValue" -->&overduelevel=<!-- TMPL_VAR NAME="overdueLevel" -->¬ifyId=<!-- TMPL_VAR NAME="notify_id" -->
+ <a href="branchoverdues.pl?action=add&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&method=phone&departement=<!-- TMPL_VAR NAME="departementValue" -->&overduelevel=<!-- TMPL_VAR NAME="overdueLevel" -->¬ifyId=<!-- TMPL_VAR NAME="notify_id" -->
">phone</a>
|
- <a href="branchoverdues.pl?action=add&bornum=<!-- TMPL_VAR NAME="borrowernumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&method=letter&departement=<!-- TMPL_VAR NAME="departementValue" -->&overduelevel=<!-- TMPL_VAR NAME="overdueLevel" -->
+ <a href="branchoverdues.pl?action=add&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&method=letter&departement=<!-- TMPL_VAR NAME="departementValue" -->&overduelevel=<!-- TMPL_VAR NAME="overdueLevel" -->
¬ifyId=<!-- TMPL_VAR NAME="notify_id" -->">letter</a>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="overdue2" -->
- <a href="branchoverdues.pl?action=add&bornum=<!-- TMPL_VAR NAME="borrowernumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&method=letter&departement=<!-- TMPL_VAR NAME="departementValue" -->&overduelevel=<!-- TMPL_VAR NAME="overdueLevel" -->¬ifyId=<!-- TMPL_VAR NAME="notify_id" -->">letter</a>
+ <a href="branchoverdues.pl?action=add&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&method=letter&departement=<!-- TMPL_VAR NAME="departementValue" -->&overduelevel=<!-- TMPL_VAR NAME="overdueLevel" -->¬ifyId=<!-- TMPL_VAR NAME="notify_id" -->">letter</a>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="overdue3" -->
- <a href="branchoverdues.pl?action=add&bornum=<!-- TMPL_VAR NAME="borrowernumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&method=lost&departement=<!-- TMPL_VAR NAME="departementValue" -->&overduelevel=<!-- TMPL_VAR NAME="overdueLevel" -->
+ <a href="branchoverdues.pl?action=add&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&method=lost&departement=<!-- TMPL_VAR NAME="departementValue" -->&overduelevel=<!-- TMPL_VAR NAME="overdueLevel" -->
¬ifyId=<!-- TMPL_VAR NAME="notify_id" -->">Considered lost</a>
<!-- /TMPL_IF -->
@@ -144,7 +144,7 @@
</p>
</td>
<td>
- <p><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!--TMPL_VAR Name="borrowernumber"-->"><!-- TMPL_VAR NAME="borrowersurname" --> <!-- TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR NAME="borrowerphone" --><br />
+ <p><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR Name="borrowernumber"-->"><!-- TMPL_VAR NAME="borrowersurname" --> <!-- TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR NAME="borrowerphone" --><br />
<!-- TMPL_IF NAME="borroweremail" --><a href="mailto:<!-- TMPL_VAR NAME="borroweremail" -->?subject=Overdue: <!-- TMPL_VAR NAME="title" -->">
<!-- TMPL_VAR NAME="borroweremail" --></a><!--/TMPL_IF-->
</p>
@@ -169,7 +169,7 @@
</td>
<td>
- <a href="branchoverdues.pl?action=remove&bornum=<!-- TMPL_VAR NAME="borrowernumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&method=phone&departement=<!-- TMPL_VAR NAME="departementValue" -->¬ify_date=<!-- TMPL_VAR NAME="notify_date" -->">cancel notification</a>
+ <a href="branchoverdues.pl?action=remove&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&method=phone&departement=<!-- TMPL_VAR NAME="departementValue" -->¬ify_date=<!-- TMPL_VAR NAME="notify_date" -->">cancel notification</a>
</td>
</tr>
<!-- /TMPL_LOOP -->
Index: koha-tmpl/intranet-tmpl/prog/en/circ/branchreserves.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/branchreserves.tmpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- koha-tmpl/intranet-tmpl/prog/en/circ/branchreserves.tmpl 17 Nov 2006 11:18:30 -0000 1.2.2.1
+++ koha-tmpl/intranet-tmpl/prog/en/circ/branchreserves.tmpl 17 Nov 2006 14:57:22 -0000 1.2.2.2
@@ -52,7 +52,7 @@
</p>
</td>
<td>
- <p><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!--TMPL_VAR Name="borrowernum"-->"><!-- TMPL_VAR NAME="borrowername" --> <!-- TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR NAME="borrowerphone" --><br />
+ <p><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR Name="borrowernum"-->"><!-- TMPL_VAR NAME="borrowername" --> <!-- TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR NAME="borrowerphone" --><br />
<!-- TMPL_IF NAME="borrowermail" --><a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Reservation: <!-- TMPL_VAR NAME="title" -->">
<!-- TMPL_VAR NAME="borrowermail" --></a><!--/TMPL_IF-->
</p>
Index: koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -u -b -r1.4.2.4 -r1.4.2.5
--- koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl 17 Nov 2006 11:18:30 -0000 1.4.2.4
+++ koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl 17 Nov 2006 14:57:22 -0000 1.4.2.5
@@ -9,9 +9,9 @@
<h3>Reserve Found</h3>
<table>
- <caption><!-- TMPL_IF Name="reserved" -->Reserve found for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF -->
+ <caption><!-- TMPL_IF Name="reserved" -->Reserve found for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR Name="borrowernumber" -->"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF -->
<!-- TMPL_IF Name="waiting" -->
- Item is marked waiting at <!-- TMPL_VAR Name="branchname" --> for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF --></caption>
+ Item is marked waiting at <!-- TMPL_VAR Name="branchname" --> for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR Name="borrowernumber" -->"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF --></caption>
<tr><th>
<!-- TMPL_IF Name="reserved" -->Set reserve to waiting and transfer book to <!-- TMPL_VAR Name="branchname" -->: <!-- /TMPL_IF -->
<!-- TMPL_IF Name="waiting" -->Cancel reservation and then attempt transfer: <!-- /TMPL_IF -->
@@ -24,7 +24,7 @@
<input type="hidden" name="tb-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="tobrcd" -->" />
<!-- /TMPL_LOOP -->
<input type="hidden" name="itemnumber" value="<!-- TMPL_VAR Name="itemnumber" -->" />
- <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="bornum" -->" />
+ <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="borrowernumber" -->" />
<!-- TMPL_IF Name="waiting" --><input type="hidden" name="barcode" value="<!-- TMPL_VAR Name="barcode" -->" />
<input type="hidden" name="request" value="KillWaiting" />
<input type="submit" value="Cancel" />
@@ -44,7 +44,7 @@
<!-- /TMPL_LOOP -->
<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->" />
- <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="bornum" -->" />
+ <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="borrowernumber" -->" />
<input type="hidden" name="tobranchcd" value="<!-- TMPL_VAR Name="tobranchcd" -->" />
<input type="hidden" name="barcode" value=<!-- TMPL_VAR Name="barcode" --> />
<input type="hidden" name="request" value="KillReserved" />
@@ -93,7 +93,7 @@
Item is already at destination branch.
<!-- /TMPL_IF -->
<!-- TMPL_IF Name="errwasreturned" -->
- Item was on loan to <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a>
+ Item was on loan to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR Name="borrowernumber" -->"><!-- TMPL_VAR Name="borcnum" --></a>
<!-- TMPL_VAR Name="name" --> and has been returned.
<!-- /TMPL_IF -->
Index: koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl,v
retrieving revision 1.6.2.9
retrieving revision 1.6.2.10
diff -u -b -r1.6.2.9 -r1.6.2.10
--- koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl 17 Nov 2006 11:18:30 -0000 1.6.2.9
+++ koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl 17 Nov 2006 14:57:22 -0000 1.6.2.10
@@ -112,7 +112,7 @@
<!-- /TMPL_IF -->
<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" />
- <input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
+ <input type="hidden" name="borrowernumberber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
<input type="hidden" name="issueconfirmed" value="1" />
<input type="hidden" name="day" value="<!-- TMPL_VAR name="day" -->" />
<input type="hidden" name="month" value="<!-- TMPL_VAR name="month" -->" />
@@ -126,7 +126,7 @@
</form>
<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
- <input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
+ <input type="hidden" name="borrowernumberber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
<div id="action">
<input type="submit" value="Don't Issue (N)" accesskey="n" />
@@ -158,7 +158,7 @@
<input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->" />
<p>
- <label for="borrnumber">Select a borrower: </label>
+ <label for="borrowernumberber">Select a borrower: </label>
<!-- TMPL_VAR name="CGIselectborrower" -->
</p>
@@ -209,7 +209,7 @@
<li>Category: <!-- TMPL_VAR name="categorycode" --></li>
<li>
- (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">details</a>
+ (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->">details</a>
/ <a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&modify=edit&destination=circ&categorycode=<!-- TMPL_VAR name="categorycode" -->">edit</a>)
</li>
</ul>
@@ -251,8 +251,8 @@
<!-- TMPL_IF NAME="charges" -->
<li>
Fines: Patron has
- <a href="/cgi-bin/koha/members/boraccount.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">outstanding fines</a>.
- Make <a href="/cgi-bin/koha/members/pay.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">Payment</a>
+ <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->">outstanding fines</a>.
+ Make <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->">Payment</a>
</li>
<!-- /TMPL_IF -->
</ul>
@@ -616,7 +616,7 @@
<input type="hidden" name="day" value="0" />
<input type="hidden" name="month" value="0" />
<input type="hidden" name="year" value="0" />
- <input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
+ <input type="hidden" name="borrowernumberber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
<input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->" />
<input type="hidden" name="print" value="maybe" />
@@ -693,13 +693,13 @@
<h2>Borrower current issues</h2>
<p>
- <a href=# onclick="javascript:window.open('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&print=page')">Print Page</a>
- / <a href=# onclick="javascript:window.open('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&print=slip')">Print Slip</a>
+ <a href=# onclick="javascript:window.open('/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&print=page')">Print Page</a>
+ / <a href=# onclick="javascript:window.open('/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&print=slip')">Print Slip</a>
</p>
<input type="hidden" value="circ" name="destination" />
<input type="hidden" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->" />
- <input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
+ <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
<!-- TMPL_IF NAME="todayissues" -->
<table>
Index: koha-tmpl/intranet-tmpl/prog/en/circ/currenttransfers.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/currenttransfers.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- koha-tmpl/intranet-tmpl/prog/en/circ/currenttransfers.tmpl 17 Nov 2006 11:18:30 -0000 1.1.2.2
+++ koha-tmpl/intranet-tmpl/prog/en/circ/currenttransfers.tmpl 17 Nov 2006 14:57:22 -0000 1.1.2.3
@@ -31,7 +31,7 @@
</td>
<td>
<!-- TMPL_IF NAME="borrowername" -->
- <p><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!--TMPL_VAR Name="borrowernum"-->"><!-- TMPL_VAR NAME="borrowername" --> <!-- TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR NAME="borrowerphone" --><br />
+ <p><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR Name="borrowernum"-->"><!-- TMPL_VAR NAME="borrowername" --> <!-- TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR NAME="borrowerphone" --><br />
<!-- TMPL_IF NAME="borrowermail" --><a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Reservation: <!-- TMPL_VAR NAME="title" -->">
<!-- TMPL_VAR NAME="borrowermail" --></a><!--/TMPL_IF-->
</p>
Index: koha-tmpl/intranet-tmpl/prog/en/circ/reserve.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/Attic/reserve.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- koha-tmpl/intranet-tmpl/prog/en/circ/reserve.tmpl 17 Nov 2006 11:18:30 -0000 1.1.2.3
+++ koha-tmpl/intranet-tmpl/prog/en/circ/reserve.tmpl 17 Nov 2006 14:57:22 -0000 1.1.2.4
@@ -25,7 +25,7 @@
<!-- TMPL_IF NAME="statusw" --><p>Waiting</p><!-- /TMPL_IF --><!-- TMPL_IF NAME="statusf" --><p>Fullfilled</p><!-- /TMPL_IF -->
</td>
<td>
- <p><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!--TMPL_VAR Name="bornum"-->"><!-- TMPL_VAR NAME="name" --></a><br /><!-- TMPL_VAR NAME="phone" --><br />
+ <p><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR Name="borrowernumber"-->"><!-- TMPL_VAR NAME="name" --></a><br /><!-- TMPL_VAR NAME="phone" --><br />
<!-- TMPL_IF NAME="email" --><a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Reservation: <!-- TMPL_VAR NAME="title" -->">
<!-- TMPL_VAR NAME="email" --></a><!--/TMPL_IF-->
</p>
Index: koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -u -b -r1.4.2.5 -r1.4.2.6
--- koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl 17 Nov 2006 11:18:30 -0000 1.4.2.5
+++ koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl 17 Nov 2006 14:57:22 -0000 1.4.2.6
@@ -11,7 +11,7 @@
<caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="itemtitle" --></a></caption>
<tr><th>Patron: </th><td>
<ul>
- <li><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a></li>
+ <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR Name="borcnum" --></a></li>
<li><!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR Name="borfirstname" --> </li>
<li><!-- TMPL_VAR Name="borstraddress" --><br />
<!-- TMPL_VAR Name="borcity" --> <!-- TMPL_VAR NAME="borzip" --></li>
@@ -21,7 +21,7 @@
<input type="submit" value="Confirm" /><!-- TMPL_LOOP Name="inputloop" -->
<input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
<input type="hidden" name="dd-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="duedate" -->" />
- <input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="bornum" -->" />
+ <input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="borrowernumber" -->" />
<!-- /TMPL_LOOP -->
<input type="hidden" name="barcode" value="0" />
</form>
@@ -33,7 +33,7 @@
<caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="itemtitle" --></a></caption>
<tr><th>Patron: </th><td>
<ul>
- <li><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a></li>
+ <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR Name="borcnum" --></a></li>
<li><!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR Name="borfirstname" --> </li>
<li><!-- TMPL_VAR Name="borstraddress" --><br />
<!-- TMPL_VAR Name="borcity" --> <!-- TMPL_VAR NAME="borzip" --></li>
@@ -46,7 +46,7 @@
<input type="submit" value="Confirm" /><!-- TMPL_LOOP Name="inputloop" -->
<input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
<input type="hidden" name="dd-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="duedate" -->" />
- <input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="bornum" -->" />
+ <input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="borrowernumber" -->" />
<!-- /TMPL_LOOP -->
<input type="hidden" name="barcode" value="0" />
</form>
@@ -59,7 +59,7 @@
<!-- TMPL_LOOP Name="inputloop" -->
<input type="hidden" name="ri-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="barcode" -->">
<input type="hidden" name="dd-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="duedate" -->">
- <input type="hidden" name="bn-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="bornum" -->">
+ <input type="hidden" name="bn-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
<!-- /TMPL_LOOP -->
<input type="hidden" name="barcode" value="0">
<input type="submit" value="OK">
@@ -77,7 +77,7 @@
<!-- TMPL_UNLESS Name="first" -->
<input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
<input type="hidden" name="dd-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="duedate" -->" />
- <input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="bornum" -->" />
+ <input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="borrowernumber" -->" />
<!-- /TMPL_UNLESS -->
<!-- /TMPL_LOOP -->
<input type="hidden" name="barcode" value="0" />
@@ -92,7 +92,7 @@
<caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="itemtitle" --></a></caption>
<tr><th>Patron: </th><td>
<ul>
- <li><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a></li>
+ <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR Name="borcnum" --></a></li>
<li><!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR Name="borfirstname" --> </li>
<li><!-- TMPL_VAR Name="borstraddress" --><br />
<!-- TMPL_VAR Name="borcity" --> <!-- TMPL_VAR NAME="borzip" --></li>
@@ -108,10 +108,10 @@
<!-- TMPL_LOOP Name="inputloop" -->
<input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
<input type="hidden" name="dd-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="duedate" -->" />
- <input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="bornum" -->" />
+ <input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="borrowernumber" -->" />
<!-- /TMPL_LOOP -->
<input type="hidden" name="itemnumber" value="<!-- TMPL_VAR Name="itemnumber" -->" />
- <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="bornum" -->" />
+ <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="borrowernumber" -->" />
<input type="hidden" name="resbarcode" value="<!-- TMPL_VAR Name="barcode" -->" /></form>
<!-- /TMPL_IF -->
@@ -128,7 +128,7 @@
<!-- TMPL_LOOP Name="inputloop" -->
<input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
<input type="hidden" name="dd-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="duedate" -->" />
- <input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="bornum" -->" />
+ <input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="borrowernumber" -->" />
<!-- /TMPL_LOOP -->
</fieldset>
</form><!-- TMPL_IF NAME="errmsgloop" --><!-- TMPL_LOOP Name="errmsgloop" -->
@@ -158,7 +158,7 @@
<tr><th>Item Information</th><th>Patron Information</th></tr>
<tr><td><!-- TMPL_VAR Name="itemtitle" -->
</td><td>
-<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR Name="ribornum" -->"><!-- TMPL_VAR Name="riborcnum" --></a>
+<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR Name="riborrowernumber" -->"><!-- TMPL_VAR Name="riborcnum" --></a>
<!-- TMPL_VAR Name="riborsurname" -->, <!-- TMPL_VAR Name="ribortitle" --> <!-- TMPL_VAR Name="riborfirstname" -->
<!-- TMPL_IF Name="flagset" -->
@@ -185,7 +185,7 @@
<td><!-- TMPL_VAR Name="ccode" --></td>
<td>
<!-- TMPL_IF Name="duedate" -->Yes, duedate
- <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->">
+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR Name="borrowernumber" -->">
<!-- TMPL_VAR Name="borcnum" -->
</a><!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR Name="borfirstname" -->
<!-- TMPL_ELSE -->
Index: koha-tmpl/intranet-tmpl/prog/en/circ/waitingreservestransfers.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/waitingreservestransfers.tmpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- koha-tmpl/intranet-tmpl/prog/en/circ/waitingreservestransfers.tmpl 17 Nov 2006 11:18:30 -0000 1.2.2.1
+++ koha-tmpl/intranet-tmpl/prog/en/circ/waitingreservestransfers.tmpl 17 Nov 2006 14:57:22 -0000 1.2.2.2
@@ -37,7 +37,7 @@
</p>
</td>
<td>
- <p><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!--TMPL_VAR Name="borrowernum"-->"><!-- TMPL_VAR NAME="borrowername" --> <!-- TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR NAME="borrowerphone" --><br />
+ <p><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR Name="borrowernum"-->"><!-- TMPL_VAR NAME="borrowername" --> <!-- TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR NAME="borrowerphone" --><br />
<!-- TMPL_IF NAME="borrowermail" --><a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Reservation: <!-- TMPL_VAR NAME="title" -->">
<!-- TMPL_VAR NAME="borrowermail" --></a><!--/TMPL_IF-->
</p>
Index: koha-tmpl/intranet-tmpl/prog/en/members/boraccount.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/boraccount.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -b -r1.2 -r1.2.2.1
--- koha-tmpl/intranet-tmpl/prog/en/members/boraccount.tmpl 13 Jun 2006 09:54:30 -0000 1.2
+++ koha-tmpl/intranet-tmpl/prog/en/members/boraccount.tmpl 17 Nov 2006 14:57:22 -0000 1.2.2.1
@@ -34,11 +34,11 @@
</table>
<!-- The manual invoice and credit buttons -->
-<form action="/cgi-bin/koha/members/maninvoice.pl" method="get"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /><input type="submit" value="Create Manual Invoice" /></form>
+<form action="/cgi-bin/koha/members/maninvoice.pl" method="get"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /><input type="submit" value="Create Manual Invoice" /></form>
-<form action="/cgi-bin/koha/members/mancredit.pl" method="get"> <input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /> <input type="submit" value="Create Manual Credit" /></form>
+<form action="/cgi-bin/koha/members/mancredit.pl" method="get"> <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /> <input type="submit" value="Create Manual Credit" /></form>
-<form action="/cgi-bin/koha/members/moremember.pl" method="get"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /> <input type="submit" value="Return to Patron Record" /></form>
+<form action="/cgi-bin/koha/members/moremember.pl" method="get"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /> <input type="submit" value="Return to Patron Record" /></form>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
Index: koha-tmpl/intranet-tmpl/prog/en/members/mancredit.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/mancredit.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- koha-tmpl/intranet-tmpl/prog/en/members/mancredit.tmpl 31 Oct 2006 10:49:14 -0000 1.1.2.2
+++ koha-tmpl/intranet-tmpl/prog/en/members/mancredit.tmpl 17 Nov 2006 14:57:22 -0000 1.1.2.3
@@ -5,10 +5,10 @@
<h2>Manual Credit</h2>
<form action="/cgi-bin/koha/members/mancredit.pl" method="post">
-<input type="hidden" name="bornum" value="<!-- TMPL_VAR Name="bornum" -->" />
+<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="borrowernumber" -->" />
<table>
- <tr><th scope="row">Patron Number</th><td><!-- TMPL_VAR Name="bornum" --></td></tr>
+ <tr><th scope="row">Patron Number</th><td><!-- TMPL_VAR Name="borrowernumber" --></td></tr>
<tr><th scope="row">Credit Type</th><td><select name="type">
<option value="C">Credit</option>
<option value="F">Forgiven</option>
@@ -21,7 +21,7 @@
<input type="submit" name="add" value="Add Credit" />
</form>
-<form action="/cgi-bin/koha/members/boraccount.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR Name="bornum" -->" name="bornum" /><input type="submit" value="Cancel" /></form>
+<form action="/cgi-bin/koha/members/boraccount.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR Name="borrowernumber" -->" name="borrowernumber" /><input type="submit" value="Cancel" /></form>
Index: koha-tmpl/intranet-tmpl/prog/en/members/maninvoice.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/maninvoice.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- koha-tmpl/intranet-tmpl/prog/en/members/maninvoice.tmpl 31 Oct 2006 10:49:14 -0000 1.1.2.2
+++ koha-tmpl/intranet-tmpl/prog/en/members/maninvoice.tmpl 17 Nov 2006 14:57:22 -0000 1.1.2.3
@@ -4,10 +4,10 @@
<!-- TMPL_INCLUDE NAME="menu-members.inc" -->
-<form action="/cgi-bin/koha/members/maninvoice.pl" method="post"><input type="hidden" name="bornum" value="<!-- TMPL_VAR Name="bornum" -->" />
+<form action="/cgi-bin/koha/members/maninvoice.pl" method="post"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="borrowernumber" -->" />
<table>
<caption>Manual Invoice</caption>
- <tr><th scope="row">Borrowernumber</th><td><!-- TMPL_VAR Name="bornum" --></td></tr>
+ <tr><th scope="row">Borrowernumber</th><td><!-- TMPL_VAR Name="borrowernumber" --></td></tr>
<tr><th scope="row">Type</th><td><select name="type">
<option value="L">Lost Item</option>
<option value="F">Fine</option>
@@ -23,7 +23,7 @@
<input type="submit" name="add" value="Add Charge" />
</form>
-<form action="/cgi-bin/koha/members/boraccount.pl" method="get"><input type="hidden" name="bornum" value="<!-- TMPL_VAR Name="bornum" -->" /><input type="submit" value="Cancel" /></form>
+<form action="/cgi-bin/koha/members/boraccount.pl" method="get"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="borrowernumber" -->" /><input type="submit" value="Cancel" /></form>
Index: koha-tmpl/intranet-tmpl/prog/en/members/member-quicksearch-results.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/member-quicksearch-results.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- koha-tmpl/intranet-tmpl/prog/en/members/member-quicksearch-results.tmpl 30 Oct 2006 16:29:20 -0000 1.1.2.1
+++ koha-tmpl/intranet-tmpl/prog/en/members/member-quicksearch-results.tmpl 17 Nov 2006 14:57:22 -0000 1.1.2.2
@@ -32,7 +32,7 @@
<!-- /TMPL_IF -->
<td><form action="member-search-results.pl" method="get"><input type="button" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','mainform','member'); return false;" /></form></td>
<td><!-- TMPL_VAR NAME="cardnumber" --></td>
- <td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> (<!-- TMPL_VAR NAME="categorycode" -->)</td>
+ <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> (<!-- TMPL_VAR NAME="categorycode" -->)</td>
<td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city --></td>
</tr>
<!-- /TMPL_LOOP -->
Index: koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -b -r1.2.2.2 -r1.2.2.3
--- koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl 31 Oct 2006 17:18:42 -0000 1.2.2.2
+++ koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl 17 Nov 2006 14:57:22 -0000 1.2.2.3
@@ -29,7 +29,7 @@
<!-- TMPL_LOOP NAME="resultsloop" -->
<tr>
<td><!-- TMPL_VAR NAME="cardnumber" --></td>
- <td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> </td>
+ <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> </td>
<td><!-- TMPL_VAR NAME="categorycode" --></td>
<td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city --></td>
<td><!-- TMPL_VAR NAME="odissue" --></td>
Index: koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl,v
retrieving revision 1.12.2.11
retrieving revision 1.12.2.12
diff -u -b -r1.12.2.11 -r1.12.2.12
--- koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl 17 Nov 2006 11:18:30 -0000 1.12.2.11
+++ koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl 17 Nov 2006 14:57:22 -0000 1.12.2.12
@@ -16,40 +16,40 @@
<!-- TMPL_IF NAME="category_type" -->
<!--TMPL_IF NAME="guarantor"-->
- <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=<!-- TMPL_VAR NAME="bornum" -->&guarantorid=<!-- TMPL_VAR NAME="guarantorborrowernumber" -->&category_type=<!-- TMPL_VAR NAME="category_type"-->">
+ <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&guarantorid=<!-- TMPL_VAR NAME="guarantorborrowernumber" -->&category_type=<!-- TMPL_VAR NAME="category_type"-->">
<!--TMPL_ELSE-->
- <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=<!-- TMPL_VAR NAME="bornum" -->&category_type=<!-- TMPL_VAR NAME="category_type"-->">
+ <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&category_type=<!-- TMPL_VAR NAME="category_type"-->">
<!--/TMPL_IF-->
Edit
</a>
<!-- TMPL_ELSE --> <!-- try with categorycode if no category_type -->
<!-- TMPL_IF NAME="categorycode" -->
- <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=<!-- TMPL_VAR NAME="bornum" -->&categorycode=<!-- TMPL_VAR NAME="categorycode"-->">
+ <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&categorycode=<!-- TMPL_VAR NAME="categorycode"-->">
Edit
</a>
<!-- TMPL_ELSE --> <!-- if no categorycode, set category_type to A by default -->
- <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=<!-- TMPL_VAR NAME="bornum" -->&category_type=A">
+ <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&category_type=A">
Edit
</a>
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
- <a href="/cgi-bin/koha/members/member-password.pl?member=<!-- TMPL_VAR NAME=bornum -->">
+ <a href="/cgi-bin/koha/members/member-password.pl?member=<!-- TMPL_VAR NAME=borrowernumber -->">
Set password
</a>
- <a href="/cgi-bin/koha/members/member-flags.pl?member=<!-- TMPL_VAR NAME=bornum -->">
+ <a href="/cgi-bin/koha/members/member-flags.pl?member=<!-- TMPL_VAR NAME=borrowernumber -->">
Privileges
</a>
<a href="javascript:confirm_deletion()">
Delete
</a>
- <a href="/cgi-bin/koha/members/boraccount.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
+ <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">
Account
</a>
- <a href="/cgi-bin/koha/members/pay.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
+ <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">
Pay Fines
</a>
- <a href="/cgi-bin/koha/members/readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
+ <a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">
Reading Record
</a>
<a href="javascript:confirm_reregistration();" onclick="javascript:document.form.value='y'" class="gest_borro_op">
@@ -141,11 +141,11 @@
<!-- TMPL_UNLESS name="I" -->
<!-- TMPL_IF name="isguarantee" -->
<!-- TMPL_IF NAME="guaranteeloop" -->
- <p><label>Guarantees:</label><ul><!-- tmpl_loop name="guaranteeloop" --><li><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME=name --> - <!-- TMPL_VAR NAME="cardnumber" --></a></li><!-- /tmpl_loop --></ul></p>
+ <p><label>Guarantees:</label><ul><!-- tmpl_loop name="guaranteeloop" --><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME=name --> - <!-- TMPL_VAR NAME="cardnumber" --></a></li><!-- /tmpl_loop --></ul></p>
<!-- /TMPL_IF -->
<!-- TMPL_ELSE -->
<!-- TMPL_IF name="guarantorborrowernumber" -->
- <p><label>Guarantor:</label><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="guarantorborrowernumber" -->"><!-- TMPL_VAR NAME="guarantorcardnumber" --></a></p>
+ <p><label>Guarantor:</label><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="guarantorborrowernumber" -->"><!-- TMPL_VAR NAME="guarantorcardnumber" --></a></p>
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
<!-- /TMPL_UNLESS -->
@@ -161,7 +161,7 @@
<div>
<h2>Items On Loan</h2>
<form action="/cgi-bin/koha/reserve/renewscript.pl" method="post">
- <input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" />
+ <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
<table>
<tr>
<th scope="col">Title</th>
@@ -257,7 +257,7 @@
</select>
</td>
<input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
- <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="bornum" -->" />
+ <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
</tr>
<!-- /tmpl_loop -->
</table>
@@ -270,13 +270,13 @@
function confirm_deletion() {
var is_confirmed = confirm('Do you confirm deletion ?');
if (is_confirmed) {
- window.location="/cgi-bin/koha/members/deletemem.pl?member=<!-- TMPL_VAR NAME="bornum" -->";
+ window.location="/cgi-bin/koha/members/deletemem.pl?member=<!-- TMPL_VAR NAME="borrowernumber" -->";
}
}
function confirm_reregistration() {
var is_confirmed = confirm('Do you confirm re_registration ?');
if (is_confirmed) {
- window.location="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&reregistration=y";
+ window.location="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&reregistration=y";
}
}
</script>
Index: koha-tmpl/intranet-tmpl/prog/en/members/pay.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/pay.tmpl,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -b -r1.4.2.1 -r1.4.2.2
--- koha-tmpl/intranet-tmpl/prog/en/members/pay.tmpl 9 Oct 2006 13:00:42 -0000 1.4.2.1
+++ koha-tmpl/intranet-tmpl/prog/en/members/pay.tmpl 17 Nov 2006 14:57:22 -0000 1.4.2.2
@@ -4,7 +4,7 @@
<h1>Pay Fines for <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --></h1>
<form action="/cgi-bin/koha/members/pay.pl" method="post">
- <input type="hidden" name="bornum" value="<!-- TMPL_VAR name="bornum" -->" />
+ <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR name="borrowernumber" -->" />
<table>
<tr>
@@ -29,7 +29,7 @@
<input type="hidden" name="accounttype<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="accounttype" -->" />
<input type="hidden" name="amount<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="amount" -->" />
<input type="hidden" name="out<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="amountoutstanding" -->" />
- <input type="hidden" name="bornum<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="bornum" -->" />
+ <input type="hidden" name="borrowernumber<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="borrowernumber" -->" />
<input type="hidden" name="accountno<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="accountno" -->" />
<input type="hidden" name="notify_id<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="notify_id" -->" />
<input type="hidden" name="notify_level<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="notify_level" -->" />
@@ -53,5 +53,5 @@
<!-- /TMPL_LOOP -->
</table>
<input type="submit" name="submit" value="Make Payment" class="submit" /></form>
-<form action="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR name="bornum" -->" method="get"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /> <input type="submit" value="Return to Patron Record" /></form>
+<form action="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->" method="get"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /> <input type="submit" value="Return to Patron Record" /></form>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
Index: koha-tmpl/intranet-tmpl/prog/en/members/readingrec.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/readingrec.tmpl,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -b -r1.3.2.2 -r1.3.2.3
--- koha-tmpl/intranet-tmpl/prog/en/members/readingrec.tmpl 17 Nov 2006 11:18:30 -0000 1.3.2.2
+++ koha-tmpl/intranet-tmpl/prog/en/members/readingrec.tmpl 17 Nov 2006 14:57:22 -0000 1.3.2.3
@@ -6,26 +6,26 @@
<!-- TMPL_IF NAME="showfulllink" -->
<ul>
<li>Showing All Items</li>
- <li><a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&limit=full">Show Last 50 Items Only</a></li>
+ <li><a href="readingrec.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&limit=full">Show Last 50 Items Only</a></li>
</ul>
<!-- TMPL_ELSE -->
<ul>
<li>Showing Last 50 Items</li>
- <li><a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&limit=full">Show All Items</a></li>
+ <li><a href="readingrec.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&limit=full">Show All Items</a></li>
</ul>
<!-- /TMPL_IF -->
<h1>Reading Record for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
<table>
<tr>
<th>
- <a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&order=title&amp;limit=<!-- TMPL_VAR name="limit" -->">Title</a>
+ <a href="readingrec.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&order=title&amp;limit=<!-- TMPL_VAR name="limit" -->">Title</a>
</th>
<th>
- <a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&order=author&limit=<!-- TMPL_VAR name="limit" -->">Author</a>
+ <a href="readingrec.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&order=author&limit=<!-- TMPL_VAR name="limit" -->">Author</a>
</th>
<th>Call No.</th>
<th>
- <a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&order=returndate DESC&limit=<!-- TMPL_VAR name="limit" -->">Return Date</a>
+ <a href="readingrec.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&order=returndate DESC&limit=<!-- TMPL_VAR name="limit" -->">Return Date</a>
</th>
</tr>
<!-- TMPL_LOOP name="loop_reading" -->
@@ -46,6 +46,6 @@
</tr>
<!-- /TMPL_LOOP -->
</table>
-<form action="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR name="bornum" -->" method="get"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /> <input type="submit" value="Return to Patron Record" /></form>
+<form action="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->" method="get"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /> <input type="submit" value="Return to Patron Record" /></form>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
Index: koha-tmpl/intranet-tmpl/prog/en/reports/bor_issues_top.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reports/bor_issues_top.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- koha-tmpl/intranet-tmpl/prog/en/reports/bor_issues_top.tmpl 26 Sep 2006 13:15:42 -0000 1.1.2.1
+++ koha-tmpl/intranet-tmpl/prog/en/reports/bor_issues_top.tmpl 17 Nov 2006 14:57:22 -0000 1.1.2.2
@@ -44,7 +44,7 @@
<!-- TMPL_VAR NAME="rowtitle" --></td>
<!-- TMPL_LOOP NAME="loopcell" -->
<!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td ><!-- /TMPL_IF -->
- <!-- TMPL_IF NAME="reference" --><a href="javascript:Dopop('../members/moremember.pl?bornum=<!-- TMPL_VAR NAME="reference" -->')" ><!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="reference" --><a href="javascript:Dopop('../members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="reference" -->')" ><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="reference" --></a><!-- /TMPL_IF -->
</td>
Index: koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl,v
retrieving revision 1.3.2.7
retrieving revision 1.3.2.8
diff -u -b -r1.3.2.7 -r1.3.2.8
--- koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl 17 Nov 2006 11:18:30 -0000 1.3.2.7
+++ koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl 17 Nov 2006 14:57:22 -0000 1.3.2.8
@@ -274,7 +274,7 @@
</select>
</td>
<td>
- <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->" ><!-- TMPL_VAR NAME="borrowernumber" --></a>
+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->" ><!-- TMPL_VAR NAME="borrowernumber" --></a>
</td>
<td><!-- TMPL_VAR NAME="notes" --></td>
<td><!-- TMPL_VAR NAME="date" --></td>
Index: koha-tmpl/intranet-tmpl/prog/en/serials/member-search.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/member-search.tmpl,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -b -r1.3.2.1 -r1.3.2.2
--- koha-tmpl/intranet-tmpl/prog/en/serials/member-search.tmpl 30 Oct 2006 15:12:34 -0000 1.3.2.1
+++ koha-tmpl/intranet-tmpl/prog/en/serials/member-search.tmpl 17 Nov 2006 14:57:22 -0000 1.3.2.2
@@ -3,8 +3,8 @@
<script type="text/javascript">
<!--
-function add_member(subscriptionid,bornum){
- var myurl = "routing.pl?subscriptionid="+subscriptionid+"&bornum="+bornum+"&op=add";
+function add_member(subscriptionid,borrowernumber){
+ var myurl = "routing.pl?subscriptionid="+subscriptionid+"&borrowernumber="+borrowernumber+"&op=add";
window.opener.location.href = myurl;
}
@@ -31,7 +31,7 @@
<tr><td class="cell"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></td>
<td class="cell"><!-- TMPL_VAR NAME="streetaddress" --></td>
<td class="cell"><a onclick="add_member(<!-- TMPL_VAR
-NAME="subscriptionid" -->,<!-- TMPL_VAR NAME="borrowernumber" -->); return false" href="/cgi-bin/koha/serials/routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->&bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&op=add">Add</a></td></tr>
+NAME="subscriptionid" -->,<!-- TMPL_VAR NAME="borrowernumber" -->); return false" href="/cgi-bin/koha/serials/routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&op=add">Add</a></td></tr>
<!-- /TMPL_LOOP -->
</table></td></tr>
</table>
Index: koha-tmpl/intranet-tmpl/prog/en/serials/viewalerts.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/viewalerts.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- koha-tmpl/intranet-tmpl/prog/en/serials/viewalerts.tmpl 2 Oct 2006 09:39:30 -0000 1.1.2.1
+++ koha-tmpl/intranet-tmpl/prog/en/serials/viewalerts.tmpl 17 Nov 2006 14:57:22 -0000 1.1.2.2
@@ -15,7 +15,7 @@
<!-- TMPL_LOOP NAME="alertloop" -->
<tr>
<td><!-- TMPL_VAR name="name" --></td>
- <td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR name="borrowernumber">" class="button serial">View</a></td>
+ <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber">" class="button serial">View</a></td>
</tr>
<!-- /TMPL_LOOP -->
</table>
Index: koha-tmpl/opac-tmpl/prog/en/opac-user.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-user.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- koha-tmpl/opac-tmpl/prog/en/opac-user.tmpl 17 Nov 2006 11:18:31 -0000 1.1.2.2
+++ koha-tmpl/opac-tmpl/prog/en/opac-user.tmpl 17 Nov 2006 14:57:22 -0000 1.1.2.3
@@ -118,7 +118,7 @@
<!-- /TMPL_IF -->
<td>
<!-- TMPL_IF NAME="status" -->
- <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&item=<!-- TMPL_VAR NAME="itemnumber" -->&bornum=<!-- TMPL_VAR NAME="borrowernumber" -->">Renew</a>
+ <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&item=<!-- TMPL_VAR NAME="itemnumber" -->&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Renew</a>
<!-- TMPL_ELSE -->
Not renewable
<!-- /TMPL_IF -->
Index: members/boraccount.pl
===================================================================
RCS file: /sources/koha/koha/members/boraccount.pl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -b -r1.2 -r1.2.2.1
--- members/boraccount.pl 18 Jan 2006 17:23:32 -0000 1.2
+++ members/boraccount.pl 17 Nov 2006 14:57:22 -0000 1.2.2.1
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: boraccount.pl,v 1.2 2006/01/18 17:23:32 tipaul Exp $
+# $Id: boraccount.pl,v 1.2.2.1 2006/11/17 14:57:22 tipaul Exp $
#writen 11/1/2000 by chris at katipo.oc.nz
#script to display borrowers account details
@@ -46,13 +46,13 @@
debug => 1,
});
-my $bornum=$input->param('bornum');
+my $borrowernumber=$input->param('borrowernumber');
#get borrower details
-my $data=borrdata('',$bornum);
+my $data=borrdata('',$borrowernumber);
#get account details
my %bor;
-$bor{'borrowernumber'}=$bornum;
+$bor{'borrowernumber'}=$borrowernumber;
my ($numaccts,$accts,$total)=getboracctrecord('',\%bor);
my $totalcredit;
if($total <= 0){
@@ -95,7 +95,7 @@
$template->param(
firstname => $data->{'firstname'},
surname => $data->{'surname'},
- bornum => $bornum,
+ borrowernumber => $borrowernumber,
total => sprintf("%.2f",$total),
totalcredit => $totalcredit,
accounts => \@accountrows );
Index: members/deletemem.pl
===================================================================
RCS file: /sources/koha/koha/members/deletemem.pl,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -b -r1.9.2.1 -r1.9.2.2
--- members/deletemem.pl 9 Nov 2006 10:45:12 -0000 1.9.2.1
+++ members/deletemem.pl 17 Nov 2006 14:57:22 -0000 1.9.2.2
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: deletemem.pl,v 1.9.2.1 2006/11/09 10:45:12 btoumi Exp $
+# $Id: deletemem.pl,v 1.9.2.2 2006/11/17 14:57:22 tipaul Exp $
#script to delete items
#written 2/5/00
@@ -61,7 +61,7 @@
unless ($userenv->{flags} == 1){
unless ($userenv->{'branch'} eq $bor->{'branchcode'}){
# warn "user ".$userenv->{'branch'} ."borrower :". $bor->{'branchcode'};
- print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$member");
+ print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$member");
exit 1;
}
}
@@ -82,7 +82,7 @@
debug => 1,
});
# print $input->header;
- $template->param(bornum => $member);
+ $template->param(borrowernumber => $member);
if ($i >0) {
$template->param(ItemsOnIssues => $i);
}
Index: members/mancredit.pl
===================================================================
RCS file: /sources/koha/koha/members/mancredit.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- members/mancredit.pl 26 Sep 2006 14:06:32 -0000 1.1.2.2
+++ members/mancredit.pl 17 Nov 2006 14:57:22 -0000 1.1.2.3
@@ -32,9 +32,9 @@
my $input=new CGI;
-my $bornum=$input->param('bornum');
+my $borrowernumber=$input->param('borrowernumber');
#get borrower details
-my $data=borrdata('',$bornum);
+my $data=borrdata('',$borrowernumber);
my $add=$input->param('add');
if ($add){
my $itemnum=$input->param('itemnum');
@@ -42,8 +42,8 @@
my $amount=$input->param('amount');
$amount = -$amount;
my $type=$input->param('type');
- manualinvoice($bornum,$itemnum,$desc,$type,$amount);
- print $input->redirect("/cgi-bin/koha/members/boraccount.pl?bornum=$bornum");
+ manualinvoice($borrowernumber,$itemnum,$desc,$type,$amount);
+ print $input->redirect("/cgi-bin/koha/members/boraccount.pl?borrowernumber=$borrowernumber");
} else {
my ($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "members/mancredit.tmpl",
@@ -53,7 +53,7 @@
flagsrequired => {borrowers => 1},
debug => 1,
});
- $template->param( bornum => $bornum);
+ $template->param( borrowernumber => $borrowernumber);
print $input->header(
-type => guesstype($template->output),
-cookie => $cookie
Index: members/maninvoice.pl
===================================================================
RCS file: /sources/koha/koha/members/maninvoice.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- members/maninvoice.pl 26 Sep 2006 14:06:32 -0000 1.1.2.2
+++ members/maninvoice.pl 17 Nov 2006 14:57:22 -0000 1.1.2.3
@@ -32,9 +32,9 @@
my $input=new CGI;
-my $bornum=$input->param('bornum');
+my $borrowernumber=$input->param('borrowernumber');
#get borrower details
-my $data=borrdata('',$bornum);
+my $data=borrdata('',$borrowernumber);
my $add=$input->param('add');
if ($add){
# print $input->header;
@@ -42,8 +42,8 @@
my $desc=$input->param('desc');
my $amount=$input->param('amount');
my $type=$input->param('type');
- manualinvoice($bornum,$itemnum,$desc,$type,$amount);
- print $input->redirect("/cgi-bin/koha/members/boraccount.pl?bornum=$bornum");
+ manualinvoice($borrowernumber,$itemnum,$desc,$type,$amount);
+ print $input->redirect("/cgi-bin/koha/members/boraccount.pl?borrowernumber=$borrowernumber");
} else {
my ($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "members/maninvoice.tmpl",
@@ -53,7 +53,7 @@
flagsrequired => {borrowers => 1},
debug => 1,
});
- $template->param(bornum => $bornum);
+ $template->param(borrowernumber => $borrowernumber);
print $input->header(
-type => guesstype($template->output),
-cookie => $cookie
Index: members/memberentry.pl
===================================================================
RCS file: /sources/koha/koha/members/memberentry.pl,v
retrieving revision 1.38.2.14
retrieving revision 1.38.2.15
diff -u -b -r1.38.2.14 -r1.38.2.15
--- members/memberentry.pl 17 Nov 2006 11:12:02 -0000 1.38.2.14
+++ members/memberentry.pl 17 Nov 2006 14:57:22 -0000 1.38.2.15
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-# $Id: memberentry.pl,v 1.38.2.14 2006/11/17 11:12:02 btoumi Exp $
+# $Id: memberentry.pl,v 1.38.2.15 2006/11/17 14:57:22 tipaul Exp $
# Copyright 2006 SAN OUEST PROVENCE et Paul POULAIN
#
@@ -221,7 +221,7 @@
print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$data{'cardnumber'}");
} else {
if ($loginexist == 0) {
- print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$borrowernumber");
+ print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");
}
}
}
Index: members/member-flags.pl
===================================================================
RCS file: /sources/koha/koha/members/member-flags.pl,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -b -r1.5 -r1.5.2.1
--- members/member-flags.pl 4 Jul 2006 14:36:52 -0000 1.5
+++ members/member-flags.pl 17 Nov 2006 14:57:22 -0000 1.5.2.1
@@ -56,7 +56,7 @@
}
my $sth=$dbh->prepare("update borrowers set flags=? where borrowernumber=?");
$sth->execute($flags, $member);
- print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$member");
+ print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$member");
} else {
# my ($bor,$flags,$accessflags)=getpatroninformation(\%env, $member,'');
my $bor = getpatroninformation(\%env, $member,'');
Index: members/member-password.pl
===================================================================
RCS file: /sources/koha/koha/members/member-password.pl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -b -r1.4 -r1.4.2.1
--- members/member-password.pl 4 Jul 2006 14:36:52 -0000 1.4
+++ members/member-password.pl 17 Nov 2006 14:57:22 -0000 1.4.2.1
@@ -54,7 +54,7 @@
my $dbh=C4::Context->dbh;
if (changepassword($uid,$member,$digest)) {
$template->param(newpassword => $newpassword);
- print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$member");
+ print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$member");
} else {
$template->param(othernames => $bor->{'othernames'},
surname => $bor->{'surname'},
Index: members/member-picupload.pl
===================================================================
RCS file: /sources/koha/koha/members/member-picupload.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- members/member-picupload.pl 22 Aug 2005 04:25:11 -0000 1.1
+++ members/member-picupload.pl 17 Nov 2006 14:57:22 -0000 1.1.2.1
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: member-picupload.pl,v 1.1 2005/08/22 04:25:11 genjimoto Exp $
+# $Id: member-picupload.pl,v 1.1.2.1 2006/11/17 14:57:22 tipaul Exp $
# script to upload a picture to a borrowerimages directory.
# checks to see if its either displaying the upload form
@@ -36,7 +36,7 @@
my $input = new CGI;
my $name = $input->param('name');
-my $bornum = $input->param('bornum');
+my $borrowernumber = $input->param('borrowernumber');
my $photo = $input->param('photo');
my $template_name;
@@ -59,7 +59,7 @@
});
if ($photo){
- my $filename=$bornum.'.jpg';
+ my $filename=$borrowernumber.'.jpg';
my $upload_filehandle = $input->upload("photo");
open UPLOADFILE, ">$upload_dir/$filename";
binmode UPLOADFILE;
@@ -71,9 +71,9 @@
}
else {
$template->param(
- bornum => $bornum,
+ borrowernumber => $borrowernumber,
name => $name
);
output_html_with_http_headers $input, $cookie, $template->output;
}
-print $input->redirect("http://intranet/cgi-bin/koha/members/moremember.pl?bornum=$bornum");
\ No newline at end of file
+print $input->redirect("http://intranet/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");
\ No newline at end of file
Index: members/moremember.pl
===================================================================
RCS file: /sources/koha/koha/members/moremember.pl,v
retrieving revision 1.28.2.7
retrieving revision 1.28.2.8
diff -u -b -r1.28.2.7 -r1.28.2.8
--- members/moremember.pl 17 Nov 2006 11:17:30 -0000 1.28.2.7
+++ members/moremember.pl 17 Nov 2006 14:57:22 -0000 1.28.2.8
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: moremember.pl,v 1.28.2.7 2006/11/17 11:17:30 tipaul Exp $
+# $Id: moremember.pl,v 1.28.2.8 2006/11/17 14:57:22 tipaul Exp $
# script to do a borrower enquiry/bring up borrower details etc
# Displays all the details about a borrower
@@ -69,12 +69,12 @@
debug => 1,
});
-my $bornum=$input->param('bornum');
+my $borrowernumber=$input->param('borrowernumber');
#start the page and read in includes
-my $data=borrdata('',$bornum);
+my $data=borrdata('',$borrowernumber);
my $reregistration=$input->param('reregistration');
# re-reregistration function to automatic calcul of date expiry
-($data->{'dateexpiry'}=GetMembeReregistration($data->{'categorycode'},$bornum,$data->{'dateenrolled'}))if ($reregistration eq 'y');
+($data->{'dateexpiry'}=GetMembeReregistration($data->{'categorycode'},$borrowernumber,$data->{'dateenrolled'}))if ($reregistration eq 'y');
my (undef,undef,undef,$category_type)=getborrowercategory($data->{'categorycode'});
$template->param($data->{'categorycode'} => 1); # in template <TMPL_IF name="I"> => instutitional (A for Adult & C for children)
$data->{'dateenrolled'} = format_date($data->{'dateenrolled'});
@@ -132,7 +132,7 @@
my $unvalidlibrarian = ((C4::Context->preference("IndependantBranches")) && (C4::Context->userenv->{flags}!=1) && ($data->{'branchcode'} ne C4::Context->userenv->{branch}));
my %bor;
-$bor{'borrowernumber'}=$bornum;
+$bor{'borrowernumber'}=$borrowernumber;
# Converts the branchcode to the branch name
my $samebranch;
@@ -156,7 +156,7 @@
($template->param(lib2 => $lib2))if($lib2);
# current issues
#
-my ($count,$issue)=borrissues($bornum);
+my ($count,$issue)=borrissues($borrowernumber);
my $roaddetails=&GetRoadTypeDetails($data->{'streettype'});
my $today=ParseDate('today');
my @issuedata;
@@ -180,7 +180,7 @@
# But &C4::Circulation::Renewals2::calc_charges doesn't appear to
# return the correct item type either (or a properly-formatted
# charge, for that matter).
- my ($charge,$itemtype)=calc_charges($dbh,$issue->[$i]{'itemnumber'},$bornum);
+ my ($charge,$itemtype)=calc_charges($dbh,$issue->[$i]{'itemnumber'},$borrowernumber);
my $itemtypeinfo = getitemtypeinfo($itemtype);
$row{'itemtype_description'} = $itemtypeinfo->{description};
@@ -204,7 +204,7 @@
#
# find reserves
#
-my ($rescount,$reserves)=FindReserves('',$bornum); #From C4::Reserves2
+my ($rescount,$reserves)=FindReserves('',$borrowernumber); #From C4::Reserves2
my @reservedata;
$toggle = 0;
foreach my $reserveline (@$reserves) {
@@ -220,14 +220,14 @@
}
# current alert subscriptions
-my $alerts = getalert($bornum);
+my $alerts = getalert($borrowernumber);
foreach (@$alerts) {
$_->{$_->{type}}=1;
$_->{relatedto} = findrelatedto($_->{type},$_->{externalid});
}
my $picture;
my $htdocs = C4::Context->config('intrahtdocs');
-$picture = "/borrowerimages/".$bornum.".jpg";
+$picture = "/borrowerimages/".$borrowernumber.".jpg";
if (-e $htdocs."$picture")
{
$template->param(picture => $picture)
@@ -235,7 +235,7 @@
$template->param($data);
$template->param(
roaddetails => $roaddetails,
- bornum => $bornum,
+ borrowernumber => $borrowernumber,
reregistration =>$reregistration,
totalprice =>sprintf("%.2f",$totalprice),
totaldue => sprintf("%.2f",$total),
Index: members/pay.pl
===================================================================
RCS file: /sources/koha/koha/members/pay.pl,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -b -r1.4.2.1 -r1.4.2.2
--- members/pay.pl 9 Oct 2006 13:00:43 -0000 1.4.2.1
+++ members/pay.pl 17 Nov 2006 14:57:22 -0000 1.4.2.2
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: pay.pl,v 1.4.2.1 2006/10/09 13:00:43 btoumi Exp $
+# $Id: pay.pl,v 1.4.2.2 2006/11/17 14:57:22 tipaul Exp $
# written 11/1/2000 by chris at katipo.oc.nz
# part of the koha library system, script to facilitate paying off fines
@@ -38,17 +38,17 @@
my $input=new CGI;
#print $input->header;
-my $bornum=$input->param('bornum');
-if ($bornum eq ''){
- $bornum=$input->param('bornum0');
+my $borrowernumber=$input->param('borrowernumber');
+if ($borrowernumber eq ''){
+ $borrowernumber=$input->param('borrowernumber0');
}
# get borrower details
-my $data=borrdata('',$bornum);
+my $data=borrdata('',$borrowernumber);
my $user=$input->remote_user;
# get account details
my %bor;
-$bor{'borrowernumber'}=$bornum;
+$bor{'borrowernumber'}=$borrowernumber;
my $branches = GetBranches();
my $printers = getprinters();
my $branch = getbranch($input, $branches);
@@ -69,9 +69,9 @@
$user=~ s/Shannon/S/i;
# FIXME : using array +4, +5, +6 is dirty. Should use arrays for each accountline
my $amount=$input->param($names[$i+4]);
- my $bornum=$input->param($names[$i+5]);
+ my $borrowernumber=$input->param($names[$i+5]);
my $accountno=$input->param($names[$i+6]);
- makepayment($bornum,$accountno,$amount,$user,$branch);
+ makepayment($borrowernumber,$accountno,$amount,$user,$branch);
$check=2;
}
}
@@ -92,7 +92,7 @@
debug => 1,
});
if ($total ne ''){
- recordpayment(\%env,$bornum,$total);
+ recordpayment(\%env,$borrowernumber,$total);
}
my ($numaccts,$accts,$total)=getboracctrecord('',\%bor);
@@ -100,7 +100,7 @@
# creation d'une fonction qui va nous retourner le notify_id dans un tableau
my @allfile;
-my @notify=NumberNotifyId($bornum);
+my @notify=NumberNotifyId($borrowernumber);
my $numberofnotify=scalar(@notify);
for (my $j=0;$j<scalar(@notify);$j++){
@@ -116,7 +116,7 @@
$line{accounttype} = $accts->[$i]{'accounttype'};
$line{amount} = sprintf("%.2f",$accts->[$i]{'amount'});
$line{amountoutstanding} = sprintf("%.2f",$accts->[$i]{'amountoutstanding'});
- $line{bornum} = $bornum;
+ $line{borrowernumber} = $borrowernumber;
$line{accountno} = $accts->[$i]{'accountno'};
$line{description} = $accts->[$i]{'description'};
$line{title} = $accts->[$i]{'title'};
@@ -136,7 +136,7 @@
allfile => \@allfile,
firstname => $data->{'firstname'},
surname => $data->{'surname'},
- bornum => $bornum,
+ borrowernumber => $borrowernumber,
total => sprintf("%.2f",$total));
print "Content-Type: text/html\n\n", $template->output;
@@ -153,28 +153,28 @@
$inp{$name[$i]}=$temp;
}
}
- my $bornum;
+ my $borrowernumber;
while ( my ($key, $value) = each %inp){
# print $key,$value;
my $accounttype=$input->param("accounttype$value");
- $bornum=$input->param("bornum$value");
+ $borrowernumber=$input->param("borrowernumber$value");
my $itemno=$input->param("itemnumber$value");
my $amount=$input->param("amount$value");
my $accountno=$input->param("accountno$value");
- writeoff($bornum,$accountno,$itemno,$accounttype,$amount);
+ writeoff($borrowernumber,$accountno,$itemno,$accounttype,$amount);
}
- $bornum=$input->param('bornum');
- print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$bornum");
+ $borrowernumber=$input->param('borrowernumber');
+ print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");
}
sub writeoff{
- my ($bornum,$accountnum,$itemnum,$accounttype,$amount)=@_;
+ my ($borrowernumber,$accountnum,$itemnum,$accounttype,$amount)=@_;
my $user=$input->remote_user;
my $dbh = C4::Context->dbh;
my $env;
my $sth=$dbh->prepare("Update accountlines set amountoutstanding=0 where (accounttype='Res' or accounttype='FU' or accounttype ='IP' OR accounttype='CH' OR accounttype='RE' OR accounttype='RL') and accountno=? and borrowernumber=?");
- $sth->execute($accountnum,$bornum);
+ $sth->execute($accountnum,$borrowernumber);
$sth->finish;
$sth=$dbh->prepare("select max(accountno) from accountlines");
$sth->execute;
@@ -183,9 +183,9 @@
$account->{'max(accountno)'}++;
$sth=$dbh->prepare("insert into accountlines (borrowernumber,accountno,itemnumber,date,amount,description,accounttype)
values (?,?,?,now(),?,'Writeoff','W')");
- $sth->execute($bornum,$account->{'max(accountno)'},$itemnum,$amount);
+ $sth->execute($borrowernumber,$account->{'max(accountno)'},$itemnum,$amount);
$sth->finish;
- UpdateStats($env,$branch,'writeoff',$amount,'','','',$bornum);
+ UpdateStats($env,$branch,'writeoff',$amount,'','','',$borrowernumber);
}
Index: members/readingrec.pl
===================================================================
RCS file: /sources/koha/koha/members/readingrec.pl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -b -r1.2 -r1.2.2.1
--- members/readingrec.pl 7 Jun 2006 02:33:09 -0000 1.2
+++ members/readingrec.pl 17 Nov 2006 14:57:22 -0000 1.2.2.1
@@ -31,9 +31,9 @@
my $input=new CGI;
-my $bornum=$input->param('bornum');
+my $borrowernumber=$input->param('borrowernumber');
#get borrower details
-my $data=borrdata('',$bornum);
+my $data=borrdata('',$borrowernumber);
my $order=$input->param('order');
my $order2=$order;
if ($order2 eq ''){
@@ -49,7 +49,7 @@
else {
$limit=50;
}
-my ($count,$issues)=allissues($bornum,$order2,$limit);
+my ($count,$issues)=allissues($borrowernumber,$order2,$limit);
my ($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "members/readingrec.tmpl",
@@ -82,7 +82,7 @@
title => $data->{'title'},
initials => $data->{'initials'},
surname => $data->{'surname'},
- bornum => $bornum,
+ borrowernumber => $borrowernumber,
limit => $limit,
firstname => $data->{'firstname'},
cardnumber => $data->{'cardnumber'},
Index: members/setdebar.pl
===================================================================
RCS file: /sources/koha/koha/members/setdebar.pl,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -b -r1.3.2.1 -r1.3.2.2
--- members/setdebar.pl 19 Oct 2006 15:35:52 -0000 1.3.2.1
+++ members/setdebar.pl 17 Nov 2006 14:57:22 -0000 1.3.2.2
@@ -43,11 +43,10 @@
my $dbh = C4::Context->dbh;
my $sth=$dbh->prepare("Update borrowers set debarred = ? where borrowernumber = ?");
$sth->execute($status,$borrowernumber);
-my $data=$sth->fetchrow_hashref;
$sth->finish;
if($destination eq "circ"){
print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$cardnumber");
} else {
- print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$borrowernumber");
+ print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");
}
Index: misc/fines2.pl
===================================================================
RCS file: /sources/koha/koha/misc/fines2.pl,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -b -r1.12 -r1.12.2.1
--- misc/fines2.pl 12 Jul 2006 13:43:42 -0000 1.12
+++ misc/fines2.pl 17 Nov 2006 14:57:22 -0000 1.12.2.1
@@ -25,7 +25,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: fines2.pl,v 1.12 2006/07/12 13:43:42 btoumi Exp $
+# $Id: fines2.pl,v 1.12.2.1 2006/11/17 14:57:22 tipaul Exp $
use C4::Context;
use C4::Search;
@@ -54,7 +54,7 @@
print $date if $DEBUG;
-my $bornum;
+my $borrowernumber;
# FIXME
# $total isn't used anywhere else in the file,
@@ -71,7 +71,7 @@
# FIXME
# delete both of these?
-#my $bornum2=$data->[0]->{'borrowernumber'};
+#my $borrowernumber2=$data->[0]->{'borrowernumber'};
#my $i2=1;
# FIXME
Index: misc/fines.pl
===================================================================
RCS file: /sources/koha/koha/misc/Attic/fines.pl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- misc/fines.pl 24 Oct 2006 08:46:26 -0000 1.1.2.4
+++ misc/fines.pl 17 Nov 2006 14:57:22 -0000 1.1.2.5
@@ -25,7 +25,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: fines.pl,v 1.1.2.4 2006/10/24 08:46:26 btoumi Exp $
+# $Id: fines.pl,v 1.1.2.5 2006/11/17 14:57:22 tipaul Exp $
use C4::Context;
use C4::Search;
@@ -57,7 +57,7 @@
$mday="0".$mday;
}
my $reference = $year."".$mon;
-my $bornum;
+my $borrowernumber;
for (my $i=0;$i<$numOverdueItems;$i++){
my @dates=split('-',$data->[$i]->{'date_due'});
Index: misc/overduenotices-30.pl
===================================================================
RCS file: /sources/koha/koha/misc/overduenotices-30.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- misc/overduenotices-30.pl 28 Feb 2006 17:20:29 -0000 1.1
+++ misc/overduenotices-30.pl 17 Nov 2006 14:57:22 -0000 1.1.2.1
@@ -133,15 +133,15 @@
my $count = 0; # to keep track of how many notices are printed
my $e_count = 0; # and e-mailed
my $date=format_date(localtime);
- my ($itemcount,$borrnum,$firstname,$lastname,$address1,$address2,$city,$postcode,$email);
+ my ($itemcount,$borrowernumber,$firstname,$lastname,$address1,$address2,$city,$postcode,$email);
- while (($itemcount,$borrnum,$firstname,$lastname,$address1,$address2,$city,$postcode,$email) = $sth->fetchrow) {
+ while (($itemcount,$borrowernumber,$firstname,$lastname,$address1,$address2,$city,$postcode,$email) = $sth->fetchrow) {
if ($data->{"debarred$i"}){
#action taken is debarring
- $rqdebarring->execute($borrnum);
- warn "debarring $borrnum $firstname $lastname";
+ $rqdebarring->execute($borrowernumber);
+ warn "debarring $borrowernumber $firstname $lastname";
}
- # print STDERR "$itemcount,$borrnum,$firstname,$lastname,$address1,$address2,$city,$postcode,$email\n";
+ # print STDERR "$itemcount,$borrowernumber,$firstname,$lastname,$address1,$address2,$city,$postcode,$email\n";
if ($letter){
my $notice .= $mailtext;
# print STDERR "$notice\n";
@@ -155,7 +155,7 @@
$notice =~ s/\<date\>/$date/g if ($date);
$notice =~ s/\<bib\>/$branchname/g if ($branchname);
- $sth2->execute($borrnum);
+ $sth2->execute($borrowernumber);
my $titles="";
my ($title, $author, $barcode, $issuedate);
while (($title, $author, $barcode,$issuedate) = $sth2->fetchrow){
Index: misc/overduenotices.pl
===================================================================
RCS file: /sources/koha/koha/misc/overduenotices.pl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -b -r1.4 -r1.4.2.1
--- misc/overduenotices.pl 20 Jun 2005 14:28:12 -0000 1.4
+++ misc/overduenotices.pl 17 Nov 2006 14:57:22 -0000 1.4.2.1
@@ -95,9 +95,9 @@
my $count = 0; # to keep track of how many notices are printed
my $e_count = 0; # and e-mailed
my $date=localtime;
-my ($itemcount,$borrnum,$firstname,$lastname,$address1,$address2,$city,$postcode,$email);
+my ($itemcount,$borrowernumber,$firstname,$lastname,$address1,$address2,$city,$postcode,$email);
-while (($itemcount,$borrnum,$firstname,$lastname,$address1,$address2,$city,$postcode,$email) = $sth->fetchrow) {
+while (($itemcount,$borrowernumber,$firstname,$lastname,$address1,$address2,$city,$postcode,$email) = $sth->fetchrow) {
my $notice = $mailtext;
$notice =~ s/\<itemcount\>/$itemcount/g;
$notice =~ s/\<firstname\>/$firstname/g;
@@ -108,7 +108,7 @@
$notice =~ s/\<postcode\>/$postcode/g;
$notice =~ s/\<date\>/$date/g;
- $sth2->execute($borrnum);
+ $sth2->execute($borrowernumber);
my $titles="";
my ($title, $author, $barcode);
while (($title, $author, $barcode) = $sth2->fetchrow){
Index: misc/tidyaccounts.pl
===================================================================
RCS file: /sources/koha/koha/misc/tidyaccounts.pl,v
retrieving revision 1.4
retrieving revision 1.4.10.1
diff -u -b -r1.4 -r1.4.10.1
--- misc/tidyaccounts.pl 13 Oct 2002 11:38:37 -0000 1.4
+++ misc/tidyaccounts.pl 17 Nov 2006 14:57:22 -0000 1.4.10.1
@@ -30,16 +30,16 @@
#print $input->header();
#print $input->dump;
-my $bornum=$input->param('bornum');
+my $borrowernumber=$input->param('borrowernumber');
my @name=$input->param;
foreach my $key (@name){
- if ($key ne 'bornum'){
+ if ($key ne 'borrowernumber'){
if (my $temp=$input->param($key)){
- fixaccounts($bornum,$key,$temp);
+ fixaccounts($borrowernumber,$key,$temp);
}
}
}
-print $input->redirect("boraccount.pl?bornum=$bornum");
+print $input->redirect("boraccount.pl?borrowernumber=$borrowernumber");
Index: misc/notifys/contact_history.pl
===================================================================
RCS file: /sources/koha/koha/misc/notifys/contact_history.pl,v
retrieving revision 1.1
retrieving revision 1.1.8.1
diff -u -b -r1.1 -r1.1.8.1
--- misc/notifys/contact_history.pl 5 Mar 2004 21:22:15 -0000 1.1
+++ misc/notifys/contact_history.pl 17 Nov 2006 14:57:22 -0000 1.1.8.1
@@ -34,12 +34,12 @@
use Data::Dumper;
my $input = new CGI;
-my $bornum = $input->param('bornum');
+my $borrowernumber = $input->param('borrowernumber');
my $date= $input->param('date');
my $edate=$input->param('edate');
print $input->header;
-if ($bornum) {
- my $borrower = BorType($bornum);
+if ($borrowernumber) {
+ my $borrower = BorType($borrowernumber);
my $querystring = " select date, method, address, result, message, borrowernumber
@@ -53,11 +53,11 @@
$sth->execute($date,$edate);
while (my $row=$sth->fetchrow_hashref()) {
- print "<a href=/cgi-bin/koha/moremember.pl?bornum=$row->{'borrowernumber'}>Borrwer Record</a> ";
+ print "<a href=/cgi-bin/koha/moremember.pl?borrowernumber=$row->{'borrowernumber'}>Borrwer Record</a> ";
if ($row->{'method'} ne 'email'){
my $tidydate=$row->{'date'};
$tidydate=~ s/ /%20/g;
- print " <a href=/cgi-bin/koha/printnote.pl?bornum=$row->{'borrowernumber'}&date=$tidydate>Print Note</a><br>";
+ print " <a href=/cgi-bin/koha/printnote.pl?borrowernumber=$row->{'borrowernumber'}&date=$tidydate>Print Note</a><br>";
}
print $row->{'date'}."<br>\n";
print $row->{'method'}."<br>\n";
Index: misc/notifys/printnote.pl
===================================================================
RCS file: /sources/koha/koha/misc/notifys/printnote.pl,v
retrieving revision 1.1
retrieving revision 1.1.8.1
diff -u -b -r1.1 -r1.1.8.1
--- misc/notifys/printnote.pl 5 Mar 2004 21:23:32 -0000 1.1
+++ misc/notifys/printnote.pl 17 Nov 2006 14:57:22 -0000 1.1.8.1
@@ -34,15 +34,15 @@
use Data::Dumper;
my $input = new CGI;
-my $bornum = $input->param('bornum');
+my $borrowernumber = $input->param('borrowernumber');
my $date= $input->param('date');
print $input->header;
-if ($bornum) {
- my $borrower = BorType($bornum);
+if ($borrowernumber) {
+ my $borrower = BorType($borrowernumber);
my $dbh=C4Connect();
my $querystring = "select * from borrowers where borrowernumber = ?";
my $sth=$dbh->prepare($querystring);
- $sth->execute($bornum);
+ $sth->execute($borrowernumber);
my $row=$sth->fetchrow_hashref();
# print "<body background=/images/letterhead.jpg> <p> <p> <p>";
print "
@@ -83,7 +83,7 @@
$sth=$dbh->prepare($querystring);
- $sth->execute($date,$bornum);
+ $sth->execute($date,$borrowernumber);
$row=$sth->fetchrow_hashref();
# print $row->{'date'}."<br>\n";
@@ -93,7 +93,7 @@
print $row->{'message'}."<br>\n";
print "<p><p>";
-#print $querystring,$date,$bornum;
+#print $querystring,$date,$borrowernumber;
}
Index: misc/plugin/Search.pm
===================================================================
RCS file: /sources/koha/koha/misc/plugin/Search.pm,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- misc/plugin/Search.pm 1 Apr 2006 22:03:33 -0000 1.1
+++ misc/plugin/Search.pm 17 Nov 2006 14:57:22 -0000 1.1.2.1
@@ -34,7 +34,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.1 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.1.2.1 $' =~ /\d+/g;
shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
=head1 NAME
@@ -193,10 +193,10 @@
=cut
#'
sub findguarantees{
- my ($bornum)=@_;
+ my ($borrowernumber)=@_;
my $dbh = C4::Context->dbh;
my $sth=$dbh->prepare("select cardnumber,borrowernumber, firstname, surname from borrowers where guarantor=?");
- $sth->execute($bornum);
+ $sth->execute($borrowernumber);
my @dat;
while (my $data = $sth->fetchrow_hashref)
@@ -224,10 +224,10 @@
=cut
#'
sub findguarantor{
- my ($bornum)=@_;
+ my ($borrowernumber)=@_;
my $dbh = C4::Context->dbh;
my $sth=$dbh->prepare("select guarantor from borrowers where borrowernumber=?");
- $sth->execute($bornum);
+ $sth->execute($borrowernumber);
my $data=$sth->fetchrow_hashref;
$sth->finish;
$sth=$dbh->prepare("Select * from borrowers where borrowernumber=?");
@@ -1986,16 +1986,16 @@
=cut
#'
sub borrdata {
- my ($cardnumber,$bornum)=@_;
+ my ($cardnumber,$borrowernumber)=@_;
$cardnumber = uc $cardnumber;
my $dbh = C4::Context->dbh;
my $sth;
- if ($bornum eq ''){
+ if ($borrowernumber eq ''){
$sth=$dbh->prepare("Select * from borrowers where cardnumber=?");
$sth->execute($cardnumber);
} else {
$sth=$dbh->prepare("Select * from borrowers where borrowernumber=?");
- $sth->execute($bornum);
+ $sth->execute($borrowernumber);
}
my $data=$sth->fetchrow_hashref;
$sth->finish;
@@ -2028,13 +2028,13 @@
=cut
#'
sub borrissues {
- my ($bornum)=@_;
+ my ($borrowernumber)=@_;
my $dbh = C4::Context->dbh;
my $sth=$dbh->prepare("Select * from issues,biblio,items where borrowernumber=?
and items.itemnumber=issues.itemnumber
and items.biblionumber=biblio.biblionumber
and issues.returndate is NULL order by date_due");
- $sth->execute($bornum);
+ $sth->execute($borrowernumber);
my @result;
while (my $data = $sth->fetchrow_hashref) {
push @result, $data;
@@ -2065,7 +2065,7 @@
=cut
#'
sub allissues {
- my ($bornum,$order,$limit)=@_;
+ my ($borrowernumber,$order,$limit)=@_;
#FIXME: sanity-check order and limit
my $dbh = C4::Context->dbh;
my $query="Select * from issues,biblio,items,biblioitems
@@ -2078,7 +2078,7 @@
}
#print $query;
my $sth=$dbh->prepare($query);
- $sth->execute($bornum);
+ $sth->execute($borrowernumber);
my @result;
my $i=0;
while (my $data=$sth->fetchrow_hashref){
@@ -2106,9 +2106,9 @@
=cut
#'
sub borrdata2 {
- my ($env,$bornum)=@_;
+ my ($env,$borrowernumber)=@_;
my $dbh = C4::Context->dbh;
- my $query="Select count(*) from issues where borrowernumber='$bornum' and
+ my $query="Select count(*) from issues where borrowernumber='$borrowernumber' and
returndate is NULL";
# print $query;
my $sth=$dbh->prepare($query);
@@ -2116,12 +2116,12 @@
my $data=$sth->fetchrow_hashref;
$sth->finish;
$sth=$dbh->prepare("Select count(*) from issues where
- borrowernumber='$bornum' and date_due < now() and returndate is NULL");
+ borrowernumber='$borrowernumber' and date_due < now() and returndate is NULL");
$sth->execute;
my $data2=$sth->fetchrow_hashref;
$sth->finish;
$sth=$dbh->prepare("Select sum(amountoutstanding) from accountlines where
- borrowernumber='$bornum'");
+ borrowernumber='$borrowernumber'");
$sth->execute;
my $data3=$sth->fetchrow_hashref;
$sth->finish;
Index: opac/opac-moredetail.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-moredetail.pl,v
retrieving revision 1.9.2.4
retrieving revision 1.9.2.5
diff -u -b -r1.9.2.4 -r1.9.2.5
--- opac/opac-moredetail.pl 17 Nov 2006 13:19:00 -0000 1.9.2.4
+++ opac/opac-moredetail.pl 17 Nov 2006 14:57:22 -0000 1.9.2.5
@@ -156,7 +156,7 @@
if ($items[$i] eq 'Available'){
print "<b>Currently on issue to:</b><br>";
} else {
- print "<b>Currently on issue to:</b> <a href=/cgi-bin/koha/moremember.pl?bornum=$items[$i]->{'borrower0'}>$items[$i]->{'card'}</a><br>";
+ print "<b>Currently on issue to:</b> <a href=/cgi-bin/koha/moremember.pl?borrowernumber=$items[$i]->{'borrower0'}>$items[$i]->{'card'}</a><br>";
}
print <<printend
<b>Last Borrower 1:</b> $items[$i]->{'card0'}<br>
Index: opac/opac-renew.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-renew.pl,v
retrieving revision 1.3
retrieving revision 1.3.8.1
diff -u -b -r1.3 -r1.3.8.1
--- opac/opac-renew.pl 4 May 2004 15:46:58 -0000 1.3
+++ opac/opac-renew.pl 17 Nov 2006 14:57:22 -0000 1.3.8.1
@@ -10,7 +10,7 @@
my $query = new CGI;
my $itemnumber = $query->param('item');
-my $borrowernumber = $query->param("bornum");
+my $borrowernumber = $query->param("borrowernumber");
Index: reports/borrowers_out.pl
===================================================================
RCS file: /sources/koha/koha/reports/borrowers_out.pl,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -b -r1.6.2.2 -r1.6.2.3
--- reports/borrowers_out.pl 10 Nov 2006 09:09:02 -0000 1.6.2.2
+++ reports/borrowers_out.pl 17 Nov 2006 14:57:22 -0000 1.6.2.3
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: borrowers_out.pl,v 1.6.2.2 2006/11/10 09:09:02 toins Exp $
+# $Id: borrowers_out.pl,v 1.6.2.3 2006/11/17 14:57:22 tipaul Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -260,16 +260,16 @@
$strcalc .= " AND borrowers.borrowernumber not in ($strqueryfilter)";
# $queryfilter->execute(@$filters[1]);
-# while (my ($bornum)=$queryfilter->fetchrow){
-# $strcalc .= " AND borrowers.borrowernumber <> $bornum ";
+# while (my ($borrowernumber)=$queryfilter->fetchrow){
+# $strcalc .= " AND borrowers.borrowernumber <> $borrowernumber ";
# }
} else {
my $strqueryfilter="SELECT DISTINCT borrowernumber FROM issues ";
my $queryfilter = $dbh->prepare("SELECT DISTINCT borrowernumber FROM issues ");
$queryfilter->execute;
$strcalc .= " AND borrowers.borrowernumber not in ($strqueryfilter)";
-# while (my ($bornum)=$queryfilter->fetchrow){
-# $strcalc .= " AND borrowers.borrowernumber <> $bornum ";
+# while (my ($borrowernumber)=$queryfilter->fetchrow){
+# $strcalc .= " AND borrowers.borrowernumber <> $borrowernumber ";
# }
}
$strcalc .= " group by borrowers.borrowernumber";
Index: reports/overdue.pl
===================================================================
RCS file: /sources/koha/koha/reports/overdue.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- reports/overdue.pl 26 Sep 2006 14:12:52 -0000 1.1.2.1
+++ reports/overdue.pl 17 Nov 2006 14:57:22 -0000 1.1.2.2
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: overdue.pl,v 1.1.2.1 2006/09/26 14:12:52 toins Exp $
+# $Id: overdue.pl,v 1.1.2.2 2006/11/17 14:57:22 tipaul Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -40,7 +40,7 @@
debug => 1,
});
my $duedate;
-my $bornum;
+my $borrowernumber;
my $itemnum;
my $data1;
my $data2;
@@ -62,11 +62,11 @@
my @overduedata;
while (my $data=$sth->fetchrow_hashref) {
$duedate=$data->{'date_due'};
- $bornum=$data->{'borrowernumber'};
+ $borrowernumber=$data->{'borrowernumber'};
$itemnum=$data->{'itemnumber'};
my $sth1=$dbh->prepare("select concat(firstname,' ',surname),phone,emailaddress from borrowers where borrowernumber=?");
- $sth1->execute($bornum);
+ $sth1->execute($borrowernumber);
$data1=$sth1->fetchrow_hashref;
$name=$data1->{'concat(firstname,\' \',surname)'};
$phone=$data1->{'phone'};
@@ -86,7 +86,7 @@
$author=$data3->{'author'};
$sth3->finish;
push (@overduedata, { duedate => $duedate,
- bornum => $bornum,
+ borrowernumber => $borrowernumber,
itemnum => $itemnum,
name => $name,
phone => $phone,
Index: reports/stats.pl
===================================================================
RCS file: /sources/koha/koha/reports/stats.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- reports/stats.pl 26 Sep 2006 14:31:41 -0000 1.1.2.1
+++ reports/stats.pl 17 Nov 2006 14:57:22 -0000 1.1.2.2
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: stats.pl,v 1.1.2.1 2006/09/26 14:31:41 toins Exp $
+# $Id: stats.pl,v 1.1.2.2 2006/11/17 14:57:22 tipaul Exp $
#written 14/1/2000
#script to display reports
@@ -123,10 +123,10 @@
my $time="$hour:$min:$sec";
my $time2="$payments[$i]{'date'}";
my $branch=Getpaidbranch($time2,$payments[$i]{'borrowernumber'});
- my $bornum=$payments[$i]{'borrowernumber'};
+ my $borrowernumber=$payments[$i]{'borrowernumber'};
my $oldtime=$payments[$i]{'timestamp'};
my $oldtype=$payments[$i]{'accounttype'};
- while ($bornum eq $payments[$i]{'borrowernumber'} && $oldtype == $payments[$i]{'accounttype'} && $oldtime eq $payments[$i]{'timestamp'}){
+ while ($borrowernumber eq $payments[$i]{'borrowernumber'} && $oldtype == $payments[$i]{'accounttype'} && $oldtime eq $payments[$i]{'timestamp'}){
my $hour=substr($payments[$i]{'timestamp'},8,2);
my $min=substr($payments[$i]{'timestamp'},10,2);
my $sec=substr($payments[$i]{'timestamp'},12,2);
@@ -146,7 +146,7 @@
push(@loop, \%row);
$oldtype=$payments[$i]{'accounttype'};
$oldtime=$payments[$i]{'timestamp'};
- $bornum=$payments[$i]{'borrowernumber'};
+ $borrowernumber=$payments[$i]{'borrowernumber'};
$i++;
}
}
Index: reserve/modrequest.pl
===================================================================
RCS file: /sources/koha/koha/reserve/modrequest.pl,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -b -r1.2.2.2 -r1.2.2.3
--- reserve/modrequest.pl 17 Nov 2006 11:17:30 -0000 1.2.2.2
+++ reserve/modrequest.pl 17 Nov 2006 14:57:22 -0000 1.2.2.3
@@ -47,7 +47,7 @@
my $from=$input->param('from');
if ($from eq 'borrower'){
- print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$borrower[0]");
+ print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrower[0]");
} else {
print $input->redirect("/cgi-bin/koha/reserve/request.pl?biblionumber=$biblionumber[0]");
}
Index: reserve/placerequest.pl
===================================================================
RCS file: /sources/koha/koha/reserve/placerequest.pl,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -b -r1.3.2.3 -r1.3.2.4
--- reserve/placerequest.pl 17 Nov 2006 11:17:30 -0000 1.3.2.3
+++ reserve/placerequest.pl 17 Nov 2006 14:57:22 -0000 1.3.2.4
@@ -42,7 +42,7 @@
my @rank=$input->param('rank-request');
my $type=$input->param('type');
my $title=$input->param('title');
-my $bornum=borrdata($borrower,'');
+my $borrowernumber=borrdata($borrower,'');
my $checkitem=$input->param('checkitem');
# my $priority;
my $found;
@@ -61,7 +61,7 @@
# END of new op .
-if ($type eq 'str8' && $bornum ne ''){
+if ($type eq 'str8' && $borrowernumber ne ''){
my $count=@bibitems;
@bibitems=sort @bibitems;
my $i2=1;
@@ -78,16 +78,16 @@
my $const;
if ($input->param('request') eq 'any'){
$const='a';
- CreateReserve(\$env,$branch,$bornum->{'borrowernumber'},$biblionumber,$const,\@realbi,$rank[0],$notes,$title,$checkitem,$found);
+ CreateReserve(\$env,$branch,$borrowernumber->{'borrowernumber'},$biblionumber,$const,\@realbi,$rank[0],$notes,$title,$checkitem,$found);
} elsif ($reqbib[0] ne ''){
$const='o';
- CreateReserve(\$env,$branch,$bornum->{'borrowernumber'},$biblionumber,$const,\@reqbib,$rank[0],$notes,$title,$checkitem, $found);
+ CreateReserve(\$env,$branch,$borrowernumber->{'borrowernumber'},$biblionumber,$const,\@reqbib,$rank[0],$notes,$title,$checkitem, $found);
} else {
- CreateReserve(\$env,$branch,$bornum->{'borrowernumber'},$biblionumber,'a',\@realbi,$rank[0],$notes,$title,$checkitem, $found);
+ CreateReserve(\$env,$branch,$borrowernumber->{'borrowernumber'},$biblionumber,'a',\@realbi,$rank[0],$notes,$title,$checkitem, $found);
}
print $input->redirect("request.pl?biblionumber=$biblionumber");
-} elsif ($bornum eq ''){
+} elsif ($borrowernumber eq ''){
print $input->header();
print "Invalid card number please try again";
print $input->Dump;
Index: reserve/renewscript.pl
===================================================================
RCS file: /sources/koha/koha/reserve/Attic/renewscript.pl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- reserve/renewscript.pl 3 Apr 2006 09:37:59 -0000 1.3
+++ reserve/renewscript.pl 17 Nov 2006 14:57:22 -0000 1.3.2.1
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: renewscript.pl,v 1.3 2006/04/03 09:37:59 plg Exp $
+# $Id: renewscript.pl,v 1.3.2.1 2006/11/17 14:57:22 tipaul Exp $
#written 18/1/2000 by chris at katipo.co.nz
#script to renew items from the web
@@ -45,12 +45,12 @@
#
my %env;
my $cardnumber = $input->param("cardnumber");
-my $bornum = $input->param("bornum");
+my $borrowernumber = $input->param("borrowernumber");
foreach my $itemno (@data) {
#check status before renewing issue
- if (renewstatus(\%env,$bornum,$itemno)){
- renewbook(\%env,$bornum,$itemno);
+ if (renewstatus(\%env,$borrowernumber,$itemno)){
+ renewbook(\%env,$borrowernumber,$itemno);
}
}
@@ -64,6 +64,6 @@
}
else {
print $input->redirect(
- '/cgi-bin/koha/members/moremember.pl?bornum='.$bornum
+ '/cgi-bin/koha/members/moremember.pl?borrowernumber='.$borrowernumber
);
}
Index: reserve/request.pl
===================================================================
RCS file: /sources/koha/koha/reserve/request.pl,v
retrieving revision 1.6.2.6
retrieving revision 1.6.2.7
diff -u -b -r1.6.2.6 -r1.6.2.7
--- reserve/request.pl 17 Nov 2006 11:17:30 -0000 1.6.2.6
+++ reserve/request.pl 17 Nov 2006 14:57:22 -0000 1.6.2.7
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: request.pl,v 1.6.2.6 2006/11/17 11:17:30 tipaul Exp $
+# $Id: request.pl,v 1.6.2.7 2006/11/17 14:57:22 tipaul Exp $
#script to place reserves/requests
#writen 2/1/00 by chris at katipo.oc.nz
@@ -358,10 +358,10 @@
$reserve{'date'} = format_date($res->{'reservedate'});
$reserve{'borrowernumber'}=$res->{'borrowernumber'};
$reserve{'biblionumber'}=$res->{'biblionumber'};
- $reserve{'bornum'}=$res->{'borrowernumber'};
+ $reserve{'borrowernumber'}=$res->{'borrowernumber'};
$reserve{'firstname'}=$res->{'firstname'};
$reserve{'surname'}=$res->{'surname'};
- $reserve{'bornum'}=$res->{'borrowernumber'};
+ $reserve{'borrowernumber'}=$res->{'borrowernumber'};
$reserve{'notes'}=$res->{'reservenotes'};
$reserve{'wait'}=(($res->{'found'} eq 'W') or ($res->{'priority'} eq '0'));
$reserve{'constrainttypea'}=($res->{'constrainttype'} eq 'a');
Index: serials/routing.pl
===================================================================
RCS file: /sources/koha/koha/serials/routing.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- serials/routing.pl 30 Oct 2006 15:15:13 -0000 1.1.2.2
+++ serials/routing.pl 17 Nov 2006 14:57:23 -0000 1.1.2.3
@@ -42,7 +42,7 @@
my $subscriptionid = $query->param('subscriptionid');
my $serialseq = $query->param('serialseq');
my $routingid = $query->param('routingid');
-my $bornum = $query->param('bornum');
+my $borrowernumber = $query->param('borrowernumber');
my $notes = $query->param('notes');
my $op = $query->param('op');
my $date_selected = $query->param('date_selected');
@@ -53,7 +53,7 @@
}
if($op eq 'add'){
- addroutingmember($bornum,$subscriptionid);
+ addroutingmember($borrowernumber,$subscriptionid);
}
if($op eq 'save'){
my $sth = $dbh->prepare("UPDATE serial SET routingnotes = ? WHERE subscriptionid = ?");
More information about the Koha-cvs
mailing list