- Koha-devel - lists.koha-community.org

CVS: koha-html/intranet-html index.html,1.2,1.3
by Chris Cornack 08 Mar '01

08 Mar '01

Update of /cvsroot/koha/koha-html/intranet-html In directory usw-pr-cvs1:/tmp/cvs-serv14200 Modified Files: index.html Log Message: Fixing broken link that was looking for front-mouseover-members.gif instead of front-mouseover-member.gif Index: index.html =================================================================== RCS file: /cvsroot/koha/koha-html/intranet-html/index.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** index.html 2001/02/07 18:05:46 1.2 --- index.html 2001/03/08 21:34:45 1.3 *************** *** 20,24 **** search.src ="/images/front-mouseover-search.gif" members=new Image; ! members.src ="/images/front-mouseover-members.gif" acquisitions=new Image; acquisitions.src ="/images/front-mouseover-acquisitions.gif" --- 20,24 ---- search.src ="/images/front-mouseover-search.gif" members=new Image; ! members.src ="/images/front-mouseover-member.gif" acquisitions=new Image; acquisitions.src ="/images/front-mouseover-acquisitions.gif"

1 0

CVS: koha-html/intranet-html/includes circulation-bottom.inc,NONE,1.1 cat-top.inc,1.2,1.3
by Chris Cornack 07 Mar '01

07 Mar '01

Update of /cvsroot/koha/koha-html/intranet-html/includes In directory usw-pr-cvs1:/tmp/cvs-serv27746 Modified Files: cat-top.inc Added Files: circulation-bottom.inc Log Message: Added bottom include for circulation, putting a little piece of javascript in cat-top.inc To spawn a new window (for catalogue maintenance) --- NEW FILE --- <br clear=all> <p>   </p> </BLOCKQUOTE> <table cellpadding=0 cellspacing=0 width="100%" border=0> <TR VALIGN=TOP BGCOLOR="000000"><TD COLSPAN=6><img src="/images/blackdot.gif" WIDTH=1 HEIGHT=2 HSPACE=0 vspace=0></TD></TR></TABLE> <CENTER> <FONT SIZE=2 face="arial, helvetica"> <A HREF="/">Home</a> || <A HREF="/cgi-bin/koha/circ/circulation.pl">Circulation</a> || <A HREF="/catalogue/">Catalogue</a> || <A HREF="/members/">Members</a> || <A HREF="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a> || <A HREF="/reports/">Reports</a> || <A HREF="/help/">Help</a> || <A HREF="http://opac.library.org.nz">OPAC</a> || <A HREF="http://www.library.org.nz">Library Website</a> </FONT> </CENTER> </BODY> </HTML> Index: cat-top.inc =================================================================== RCS file: /cvsroot/koha/koha-html/intranet-html/includes/cat-top.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** cat-top.inc 2001/02/05 18:54:58 1.2 --- cat-top.inc 2001/03/07 21:25:48 1.3 *************** *** 36,39 **** --- 36,44 ---- } + function messenger(url){ + window1=window.open(url,"window1","height=250,width=350,left=150,top=50,350,screenY=50"); + + } + //-->

1 0

CVS: koha insertdata.pl,1.2,1.3
by Chris Cornack 07 Mar '01

07 Mar '01

Update of /cvsroot/koha/koha In directory usw-pr-cvs1:/tmp/cvs-serv25915 Modified Files: insertdata.pl Log Message: Fixing stupid bug that was causing the sql insert command to break if a person had a ' in their name Index: insertdata.pl =================================================================== RCS file: /cvsroot/koha/koha/insertdata.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** insertdata.pl 2001/03/07 01:48:48 1.2 --- insertdata.pl 2001/03/07 21:12:47 1.3 *************** *** 24,27 **** --- 24,29 ---- foreach my $key (@names){ $data{$key}=$input->param($key); + $data{$key}=~ s/\'/\\\'/g; + $data{$key}=~ s/\"/\\\"/g; } my $dbh=C4Connect;

1 0

CVS: koha moremember.pl,1.3,1.4
by Chris Cornack 07 Mar '01

07 Mar '01

Update of /cvsroot/koha/koha In directory usw-pr-cvs1:/tmp/cvs-serv24495 Modified Files: moremember.pl Log Message: Changing the form so it passes through a modify value to tell the script to show the flags Index: moremember.pl =================================================================== RCS file: /cvsroot/koha/koha/moremember.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** moremember.pl 2001/02/21 22:17:58 1.3 --- moremember.pl 2001/03/07 21:02:48 1.4 *************** *** 15,18 **** --- 15,19 ---- use C4::Reserves2; use C4::Circulation::Renewals2; + use C4::Circulation::Circ2; my $input = new CGI; my $bornum=$input->param('bornum'); *************** *** 96,102 **** <form action=/cgi-bin/koha/memberentry.pl method=post> <input type=hidden name=bornum value=$bornum> ! <INPUT TYPE="image" name="submit" VALUE="modify" height=42 WIDTH=93 BORDER=0 src="/images/modify-mem.gif"> ! <INPUT TYPE="image" name="submit" VALUE="delete" height=42 WIDTH=93 BORDER=0 src="/images/delete-mem.gif"> </p> --- 97,103 ---- <form action=/cgi-bin/koha/memberentry.pl method=post> <input type=hidden name=bornum value=$bornum> ! <INPUT TYPE="image" name="modify" VALUE="modify" height=42 WIDTH=93 BORDER=0 src="/images/modify-mem.gif"> ! <INPUT TYPE="image" name="delete" VALUE="delete" height=42 WIDTH=93 BORDER=0 src="/images/delete-mem.gif"> </p> *************** *** 132,136 **** print "<td>$accts->[$i]{'date'}</td>"; # print "<TD>$accts->[$i]{'accounttype'}</td>"; ! print "<TD>$accts->[$i]{'description'} $accts->[$i]{'title'}</td> <TD>$amount</td><td>$amount2</td> </tr>"; --- 133,143 ---- print "<td>$accts->[$i]{'date'}</td>"; # print "<TD>$accts->[$i]{'accounttype'}</td>"; ! print "<TD>"; ! my $env; ! if ($accts->[$i]{'accounttype'} ne 'Res'){ ! my $iteminfo=C4::Circulation::Circ2::getiteminformation($env,$accts->[$i]->{'itemnumber'},''); ! print "<a href=/cgi-bin/koha/moredetail.pl?itemnumber=$accts->[$i]->{'itemnumber'}&bib=$iteminfo->{'biblionumber'}&bi=$iteminfo->{'biblioitemnumber'}>$accts->[$i]->{'description'} $accts->[$i]{'title'}</a>"; ! } ! print "</td> <TD>$amount</td><td>$amount2</td> </tr>";

1 0

CVS: koha memberentry.pl,1.1.1.1,1.2 insertdata.pl,1.1.1.1,1.2
by Chris Cornack 07 Mar '01

07 Mar '01

Update of /cvsroot/koha/koha In directory usw-pr-cvs1:/tmp/cvs-serv13116 Modified Files: memberentry.pl insertdata.pl Log Message: Added the functionality to allow librarians to manipulate the flag status on borrowers ie lost, debarred, and gone no address Index: memberentry.pl =================================================================== RCS file: /cvsroot/koha/koha/memberentry.pl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** memberentry.pl 2000/12/19 23:45:52 1.1.1.1 --- memberentry.pl 2001/03/07 01:48:48 1.2 *************** *** 16,24 **** } my $type=$input->param('type'); ! print $input->header; print startpage(); print startmenu('member'); ! if ($type ne 'Add'){ print mkheadr(1,'Update Member Details'); --- 16,24 ---- } my $type=$input->param('type'); ! my $modify=$input->param('modify.x'); print $input->header; print startpage(); print startmenu('member'); ! #print $modify; if ($type ne 'Add'){ print mkheadr(1,'Update Member Details'); *************** *** 372,380 **** <td COLSPAN=4><textarea name=borrowernotes wrap=physical cols=70 rows=3>$data->{'borrowernotes'}</textarea></td></tr> <tr><td>  </TD></TR> ! <tr valign=top bgcolor=white><td COLSPAN=5 align=right > printend ; ! if ($type ne 'modify'){ print <<printend <input type=image src="/images/save-changes.gif" WIDTH=188 HEIGHT=44 ALT="Add New Member" border=0 ></td> printend --- 372,415 ---- <td COLSPAN=4><textarea name=borrowernotes wrap=physical cols=70 rows=3>$data->{'borrowernotes'}</textarea></td></tr> <tr><td>  </TD></TR> ! ! printend ! ; ! if ($modify){ ! print <<printend ! <tr><td><Font size=2>FLAGS</font></td></tr> ! <tr><td>Gone No Address</td> ! <td><input type=radio name=gna value=1 printend ; ! if ($data->{'gonenoaddress'} eq '1'){ ! print " checked"; ! } ! print ">Yes <input type=radio name=gna value=0"; ! if ($data->{'gonenoaddress'} eq '0'){ ! print " checked"; ! } ! print ">No</td></tr>\n"; ! print "<tr><td>Lost</td><td><input type=radio name=lost value=1"; ! if ($data->{'lost'} eq '1'){ ! print " checked"; ! } ! print ">Yes<input type=radio name=lost value=0"; ! if ($data->{'lost'} eq '0'){ ! print " checked"; ! } ! print ">No</td></tr>\n"; ! print "<tr><td>Debarred</td><td><input type=radio name=debarred value=1"; ! if ($data->{'debarred'} eq '1'){ ! print " checked"; ! } ! print ">Yes<input type=radio name=debarred value=0"; ! if ($data->{'debarred'} eq '0'){ ! print " checked"; ! } ! print ">No</td></tr>\n"; ! } ! if ($type eq 'Add'){ print <<printend + <tr valign=top bgcolor=white><td COLSPAN=5 align=right > <input type=image src="/images/save-changes.gif" WIDTH=188 HEIGHT=44 ALT="Add New Member" border=0 ></td> printend *************** *** 382,385 **** --- 417,421 ---- } else { print <<printend + <tr valign=top bgcolor=white><td COLSPAN=5 align=right > <input type=image src="/images/save-changes.gif" WIDTH=188 HEIGHT=44 ALT="Add New Member" border=0 ></td> printend Index: insertdata.pl =================================================================== RCS file: /cvsroot/koha/koha/insertdata.pl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** insertdata.pl 2000/12/19 23:45:51 1.1.1.1 --- insertdata.pl 2001/03/07 01:48:48 1.2 *************** *** 38,42 **** categorycode='$data{'categorycode'}',city='$data{'city'}',area='$data{'area'}',phone='$data{'phone'}', borrowernotes='$data{'borrowernotes'}',altphone='$data{'altphone'}',surname='$data{'surname'}', ! initials='$data{'initials'}',streetaddress='$data{'address'}',ethnicity='$data{'ethnicity'}' where borrowernumber=$data{'borrowernumber'}"; # print $query; --- 38,43 ---- categorycode='$data{'categorycode'}',city='$data{'city'}',area='$data{'area'}',phone='$data{'phone'}', borrowernotes='$data{'borrowernotes'}',altphone='$data{'altphone'}',surname='$data{'surname'}', ! initials='$data{'initials'}',streetaddress='$data{'address'}',ethnicity='$data{'ethnicity'}', ! gonenoaddress='$data{'gna'}',lost='$data{'lost'}',debarred='$data{'debarred'}' where borrowernumber=$data{'borrowernumber'}"; # print $query;

1 0

CVS: koha search.pl,1.2,1.3
by Chris Cornack 06 Mar '01

06 Mar '01

Update of /cvsroot/koha/koha In directory usw-pr-cvs1:/tmp/cvs-serv5194 Modified Files: search.pl Log Message: Fixing " glitch in titles Index: search.pl =================================================================== RCS file: /cvsroot/koha/koha/search.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** search.pl 2001/02/11 22:38:17 1.2 --- search.pl 2001/03/06 21:16:10 1.3 *************** *** 3,8 **** #modified 9/11/1999 by chris(a)katipo.co.nz #adding an extra comment to play with CVS (Si, 19/11/99) ! #modified 29/12/99 by chris(a)katipo.co.nz to be usavle by opac as well #modified by chris 10/11/00 to fix dewey search use strict; --- 3,9 ---- #modified 9/11/1999 by chris(a)katipo.co.nz #adding an extra comment to play with CVS (Si, 19/11/99) ! #modified 29/12/99 by chris(a)katipo.co.nz to be usable by opac as well #modified by chris 10/11/00 to fix dewey search + #modified by chris(a)katipo.co.nz 3/2/01 to fix glitch with " in titles use strict; *************** *** 137,140 **** --- 138,142 ---- my $title2=$stuff[1]; $title2=~ s/ /%20/g; + $title2=~ s/\W//g; if ($subject eq ''){ # print $stuff[0];

1 0

CVS: koha opac-search.pl,1.1.1.1,1.2
by Chris Cornack 06 Mar '01

06 Mar '01

Update of /cvsroot/koha/koha In directory usw-pr-cvs1:/tmp/cvs-serv4735 Modified Files: opac-search.pl Log Message: Fixing a bug in the opac search that meant that titles that contained " were caused the detail page to error Index: opac-search.pl =================================================================== RCS file: /cvsroot/koha/koha/opac-search.pl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** opac-search.pl 2000/12/19 23:45:52 1.1.1.1 --- opac-search.pl 2001/03/06 21:13:00 1.2 *************** *** 60,64 **** my $title2=$stuff[1]; $title2=~ s/ /%20/g; ! $stuff[1]=mklink("/cgi-bin/koha/detail.pl?bib=$stuff[2]&title=$title2&type=opac",$stuff[1]); my $word=$stuff[0]; --- 60,64 ---- my $title2=$stuff[1]; $title2=~ s/ /%20/g; ! $title2=~ s/\W//g; $stuff[1]=mklink("/cgi-bin/koha/detail.pl?bib=$stuff[2]&title=$title2&type=opac",$stuff[1]); my $word=$stuff[0];

1 0

CVS: koha delbiblio.pl,1.1.1.1,1.2
by Chris Cornack 27 Feb '01

27 Feb '01

Update of /cvsroot/koha/koha In directory usw-pr-cvs1:/tmp/cvs-serv22597 Modified Files: delbiblio.pl Log Message: Quick fix to stop ppl from being able to delete biblios that have items attached Index: delbiblio.pl =================================================================== RCS file: /cvsroot/koha/koha/delbiblio.pl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** delbiblio.pl 2000/12/19 23:45:51 1.1.1.1 --- delbiblio.pl 2001/02/27 22:08:57 1.2 *************** *** 17,21 **** my $biblio=$input->param('biblio'); ! delbiblio($biblio); print $input->redirect("/catalogue/"); --- 17,32 ---- my $biblio=$input->param('biblio'); + #print $input->header; + #check no items attached + my $count=C4::Acquisitions::itemcount($biblio); ! ! #print $count; ! if ($count > 0){ ! print $input->header; ! print "This biblio has $count items attached, please delete them before deleting this biblio<p> ! "; ! } else { ! #delbiblio($biblio); print $input->redirect("/catalogue/"); + }

1 0

CVS: koha/circ circulation.pl,1.13,1.14
by Chris Cornack 21 Feb '01

21 Feb '01

Update of /cvsroot/koha/koha/circ In directory usw-pr-cvs1:/tmp/cvs-serv3991/circ Modified Files: circulation.pl Log Message: Rejigged printing issues, to print out everything on issue to the borrower Index: circulation.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/circulation.pl,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** circulation.pl 2001/02/14 02:41:43 1.13 --- circulation.pl 2001/02/21 22:33:48 1.14 *************** *** 31,35 **** $env{'branchcode'}=$branch; $env{'printer'}=$printer; ! #$env{'queue'}=$printer; my $branchcount=0; my $printercount=0; --- 31,35 ---- $env{'branchcode'}=$branch; $env{'printer'}=$printer; ! $env{'queue'}=$printer; my $branchcount=0; my $printercount=0; *************** *** 330,334 **** <table border=0 cellpadding=5 cellspacing=0 bgcolor=#dddddd> <tr><th colspan=6 bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black>Returned Items</font></th></tr> ! <tr><th>Due Date</th><th>Bar Code</th><th>Title</th><th>Author</th><th>Class</th><th>Borrower</th></tr> EOF my $color=''; --- 330,334 ---- <table border=0 cellpadding=5 cellspacing=0 bgcolor=#dddddd> <tr><th colspan=6 bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black>Returned Items</font></th></tr> ! <tr><th>Due Date</th><th>Bar Code</th><th>Title</th><th>Author</th><th>Type</th><th>Borrower</th></tr> EOF my $color=''; *************** *** 345,349 **** my ($borrower) = getpatroninformation(\%env,$borrowernumber,0); my ($iteminformation) = getiteminformation(\%env, 0, $barcode); ! print "<tr><td bgcolor=$color>$overduetext</td><td bgcolor=$color align=center><a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$barcode</a></td><td bgcolor=$color>$iteminformation->{'title'}</td><td bgcolor=$color>$iteminformation->{'author'}</td><td bgcolor=$color align=center>$iteminformation->{'dewey'} $iteminformation->{'subclass'}</td><td bgcolor=$color><img src=/images/blackdot.gif><a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this,'Member', 480, 640)\">$borrower->{'cardnumber'}</a> $borrower->{'firstname'} $borrower->{'surname'}</td></tr>\n"; } print "</table>\n"; --- 345,349 ---- my ($borrower) = getpatroninformation(\%env,$borrowernumber,0); my ($iteminformation) = getiteminformation(\%env, 0, $barcode); ! print "<tr><td bgcolor=$color>$overduetext</td><td bgcolor=$color align=center><a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$barcode</a></td><td bgcolor=$color>$iteminformation->{'title'}</td><td bgcolor=$color>$iteminformation->{'author'}</td><td bgcolor=$color align=center>$iteminformation->{'itemtype'}</td><td bgcolor=$color><img src=/images/blackdot.gif><a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this,'Member', 480, 640)\">$borrower->{'cardnumber'}</a> $borrower->{'firstname'} $borrower->{'surname'}</td></tr>\n"; } print "</table>\n"; *************** *** 360,369 **** my $borrowernumber=$query->param('borrnumber'); my $barcode=$query->param('barcode'); - # if (!$barcode){ - # $barcode=' '; - # } if ($barcode eq ''){ ! $print='yes'; ! } elsif ($barcode eq ' '){ $query->param('barcode',''); --- 360,365 ---- my $borrowernumber=$query->param('borrnumber'); my $barcode=$query->param('barcode'); if ($barcode eq ''){ ! $print='yes'; } elsif ($barcode eq ' '){ $query->param('barcode',''); *************** *** 374,390 **** $env{'todaysissues'}=1; my ($borrowerissues) = currentissues(\%env, $borrower); my $i=0; my @issues; foreach (sort keys %$borrowerissues) { $issues[$i]=$borrowerissues->{$_}; - #print $issues[$i]->{'date_due'}; $i++; ! ! #print $i; } - # print $i; remoteprint(\%env,\@issues,$borrower); $query->param('borrnumber','') - # $borrowernumber=''; } unless ($noheader) { --- 370,389 ---- $env{'todaysissues'}=1; my ($borrowerissues) = currentissues(\%env, $borrower); + $env{'nottodaysissues'}=1; + $env{'todaysissues'}=0; + my ($borroweriss2)=currentissues(\%env, $borrower); + $env{'nottodaysissues'}=0; my $i=0; my @issues; foreach (sort keys %$borrowerissues) { $issues[$i]=$borrowerissues->{$_}; $i++; ! } ! foreach (sort keys %$borroweriss2) { ! $issues[$i]=$borroweriss2->{$_}; ! $i++; } remoteprint(\%env,\@issues,$borrower); $query->param('borrnumber','') } unless ($noheader) {

1 0

CVS: koha stats.pl,1.2,1.3
by Chris Cornack 21 Feb '01

21 Feb '01

Update of /cvsroot/koha/koha In directory usw-pr-cvs1:/tmp/cvs-serv1935 Modified Files: stats.pl Log Message: Fixed a little glitch in the daily stats script that meant it wasnt counting renewals Index: stats.pl =================================================================== RCS file: /cvsroot/koha/koha/stats.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** stats.pl 2001/01/31 23:40:25 1.2 --- stats.pl 2001/02/21 22:27:59 1.3 *************** *** 46,50 **** my %shannon; my $oldtime; ! #my $totalc=0; #my $totalcf=0; print mktablehdr; --- 46,50 ---- my %shannon; my $oldtime; ! my $totalw=0; #my $totalcf=0; print mktablehdr; *************** *** 55,60 **** my $sec=substr($payments[$i]{'timestamp'},12,2); my $time="$hour:$min:$sec"; ! $payments[$i]{'amount'}*=-1; ! $total+=$payments[$i]{'amount'}; my @charges=getcharges($payments[$i]{'borrowernumber'},$payments[$i]{'timestamp'}); my $count=@charges; --- 55,63 ---- my $sec=substr($payments[$i]{'timestamp'},12,2); my $time="$hour:$min:$sec"; ! if ($payments[$i]{'accounttype'} ne 'W'){ ! $payments[$i]{'amount'}*=-1; ! $total+=$payments[$i]{'amount'}; ! } ! my @charges=getcharges($payments[$i]{'borrowernumber'},$payments[$i]{'timestamp'}); my $count=@charges; *************** *** 63,84 **** my $temptotalres=0; my $temptotalren=0; ! for (my $i2=0;$i2<$count;$i2++){ if ($charges[$i2]->{'amountoutstanding'} != $oldtime){ ! print mktablerow(6,'red',$charges[$i2]->{'description'},$charges[$i2]->{'accounttype'},'', ! $charges[$i2]->{'amount'},$charges[$i2]->{'amountoutstanding'}); ! if ($charges[$i2]->{'accounttype'} eq 'Rent'){ ! $temptotalr+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'}; ! } ! if ($charges[$i2]->{'accounttype'} eq 'F' || $charges[$i2]->{'accounttype'} eq 'FU'){ ! $temptotalf+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'}; ! } ! if ($charges[$i2]->{'accounttype'} eq 'Res'){ ! $temptotalres+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'}; } ! if ($charges[$i2]->{'accounttype'} eq 'R'){ ! $temptotalren+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'}; ! } ! } ! } my $time2="$payments[$i]{'date'} $time"; my $branch=Getpaidbranch($time2); --- 66,96 ---- my $temptotalres=0; my $temptotalren=0; ! my $temptotalw=0; ! ! ! for (my $i2=0;$i2<$count;$i2++){ if ($charges[$i2]->{'amountoutstanding'} != $oldtime){ ! print mktablerow(6,'red',$charges[$i2]->{'description'},$charges[$i2]->{'accounttype'},'', ! $charges[$i2]->{'amount'},$charges[$i2]->{'amountoutstanding'}); ! if ($payments[$i]{'accounttype'} ne 'W'){ ! # print $payments[$i]{'accounttype'}; ! if ($charges[$i2]->{'accounttype'} eq 'Rent'){ ! $temptotalr+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'}; ! } ! if ($charges[$i2]->{'accounttype'} eq 'F' || $charges[$i2]->{'accounttype'} eq 'FU'){ ! $temptotalf+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'}; ! } ! if ($charges[$i2]->{'accounttype'} eq 'Res'){ ! $temptotalres+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'}; ! } ! if ($charges[$i2]->{'accounttype'} eq 'R'){ ! $temptotalren+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'}; ! } ! } } ! } ! if ($payments[$i]{'accounttype'} eq 'W'){ ! $totalw+=$payments[$i]{'amount'}; ! } my $time2="$payments[$i]{'date'} $time"; my $branch=Getpaidbranch($time2); *************** *** 112,117 **** print mktableft; print endcenter; ! print "<p><b>$total</b>"; ! #print "<b print mktablehdr; $levin{'issues'}=Count('issue','C',$date,$date2); --- 124,130 ---- print mktableft; print endcenter; ! #$totalw=$totalw * -1; ! print "<p><b>Total Paid $total</b>"; ! print "<br><b>total written off $totalw</b>"; print mktablehdr; $levin{'issues'}=Count('issue','C',$date,$date2); *************** *** 121,130 **** $foxton{'returns'}=Count('return','F',$date,$date2); $shannon{'returns'}=Count('return','S',$date,$date2); print mktablerow(9,'white',"<b>Levin</b>","Fines $levin{'totalf'}","Rental Charges $levin{'totalr'}", ! "Reserve Charges $levin{'totalres'}","Renewal Charges $levin{'totalren'}","Total $levin{'total'}", "Issues $levin{'issues'}","Renewals $levin{'renewals'}","Returns $levin{'returns'}"); ! print mktablerow(9,'white',"<b>foxton</b>","Fines $foxton{'totalf'}","Rental Charges $foxton{'totalr'}","Reserve Charges $foxton{'totalres'}","Renewal Charges $foxton{'totalren'}","Total $foxton{'total'}", "Issues $foxton{'issues'}","Renewals $foxton{'renewals'}","Returns $foxton{'returns'}"); ! print mktablerow(9,'white',"<b>shannon</b>","Fines $shannon{'totalf'}","Rental Charges $shannon{'totalr'}","Reserve Charges $shannon{'totalres'}","Renewal Charges $shannon{'totalren'}","Total $shannon{'total'}", "Issues $shannon{'issues'}","Renewals $shannon{'renewals'}","Returns $shannon{'returns'}"); print mktableft; --- 134,147 ---- $foxton{'returns'}=Count('return','F',$date,$date2); $shannon{'returns'}=Count('return','S',$date,$date2); + $levin{'renewals'}=Count('renew','C',$date,$date2); + $foxton{'renewals'}=Count('renew','F',$date,$date2); + $shannon{'renewals'}=Count('renew','S',$date,$date2); + print mktablerow(9,'white',"<b>Levin</b>","Fines $levin{'totalf'}","Rental Charges $levin{'totalr'}", ! "Reserve Charges $levin{'totalres'}","Renewal Charges $levin{'totalren'}","<b>Total $levin{'total'}</b>", "Issues $levin{'issues'}","Renewals $levin{'renewals'}","Returns $levin{'returns'}"); ! print mktablerow(9,'white',"<b>foxton</b>","Fines $foxton{'totalf'}","Rental Charges $foxton{'totalr'}","Reserve Charges $foxton{'totalres'}","Renewal Charges $foxton{'totalren'}","<b>Total $foxton{'total'}</b>", "Issues $foxton{'issues'}","Renewals $foxton{'renewals'}","Returns $foxton{'returns'}"); ! print mktablerow(9,'white',"<b>shannon</b>","Fines $shannon{'totalf'}","Rental Charges $shannon{'totalr'}","Reserve Charges $shannon{'totalres'}","Renewal Charges $shannon{'totalren'}","<b>Total $shannon{'total'}</b>", "Issues $shannon{'issues'}","Renewals $shannon{'renewals'}","Returns $shannon{'returns'}"); print mktableft;

1 0