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

CVS: koha/circ circulation.pl,1.18,1.19
by Chris Cormack 20 Apr '01

20 Apr '01

Update of /cvsroot/koha/koha/circ In directory usw-pr-cvs1:/tmp/cvs-serv23523/circ Modified Files: circulation.pl Log Message: Quick bodge to restrict the number of returned books showing to 8. (Request from the librarians here to speed up the screen reload) Needs to be tidied up Index: circulation.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/circulation.pl,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** circulation.pl 2001/04/03 21:32:37 1.18 --- circulation.pl 2001/04/20 00:31:02 1.19 *************** *** 383,391 **** --- 383,399 ---- EOF my $color=''; + #set up so only the lat 8 returned items display (make for faster loading pages) + my $count=0; foreach (sort {$a <=> $b} keys %returneditems) { + if ($count < 8){ ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); my $barcode=$returneditems{$_}; my $duedate=$riduedate{$_}; my @datearr = localtime(time()); + ### + # convert to nz date format + my @tempdate=split(/-/,$duedate); + $duedate="$tempdate[2]/$tempdate[1]/$tempdate[0]"; + #### my $todaysdate = (1900+$datearr[5]).'-'.sprintf ("%0.2d", ($datearr[4]+1)).'-'.sprintf ("%0.2d", $datearr[3]); my $overduetext="$duedate"; *************** *** 396,399 **** --- 404,411 ---- 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=/koha/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"; + } else { + last + } + $count++; } print "</table>\n"; *************** *** 635,638 **** --- 647,657 ---- my $datedue=$bookissue->{'date_due'}; my $dd=$bookissue->{'date_due'}; + #convert to nz style dates + #this should be set with some kinda config variable + + my @tempdate=split(/-/,$dd); + $dd="$tempdate[2]/$tempdate[1]/$tempdate[0]"; + + ##### $datedue=~s/-//g; if ($datedue < $todaysdate) {

1 0

CVS: koha/C4 Accounts2.pm,1.3,1.4
by Chris Cormack 18 Apr '01

18 Apr '01

Update of /cvsroot/koha/koha/C4 In directory usw-pr-cvs1:/tmp/cvs-serv10396/C4 Modified Files: Accounts2.pm Log Message: Add functionality so that when the replacement cost of a lost item is paid Its returned off the members/patrons card. And a note is placed on the item saying that its been paid for. The item stays marked as lost. But the patron does not accrue more fines Index: Accounts2.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Accounts2.pm,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** Accounts2.pm 2001/04/02 22:51:26 1.3 --- Accounts2.pm 2001/04/18 02:51:18 1.4 *************** *** 9,12 **** --- 9,13 ---- use C4::Database; use C4::Stats; + use C4::Search; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); *************** *** 109,112 **** --- 110,115 ---- sub makepayment{ #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)=@_; my $env; *************** *** 115,121 **** my $nextaccntno = getnextacctno($env,$bornumber,$dbh); my $newamtos=0; my $updquery="Update accountlines set amountoutstanding=0 where borrowernumber=$bornumber and accountno=$accountno"; ! my $sth=$dbh->prepare($updquery); $sth->execute; $sth->finish; --- 118,130 ---- my $nextaccntno = getnextacctno($env,$bornumber,$dbh); my $newamtos=0; + my $sel="Select * from accountlines where borrowernumber=$bornumber and + accountno=$accountno"; + my $sth=$dbh->prepare($sel); + $sth->execute; + my $data=$sth->fetchrow_hashref; + $sth->finish; my $updquery="Update accountlines set amountoutstanding=0 where borrowernumber=$bornumber and accountno=$accountno"; ! $sth=$dbh->prepare($updquery); $sth->execute; $sth->finish; *************** *** 138,141 **** --- 147,154 ---- $sth->finish; $dbh->disconnect; + #check to see what accounttype + if ($data->{'accounttype'} eq 'Rep' || $data->{'accounttype'} eq 'L'){ + returnlost($bornumber,$data->{'itemnumber'}); + } } *************** *** 174,177 **** $dbh->disconnect; } ! END { } # module clean-up code here (global destructor) --- 187,208 ---- $dbh->disconnect; } ! ! sub returnlost{ ! my ($borrnum,$itemnum)=@_; ! my $dbh=C4Connect; ! my $borrower=borrdata('',$borrnum); #from C4::Search; ! my $upiss="Update issues set returndate=now() where ! borrowernumber='$borrnum' and itemnumber='$itemnum' and returndate is null"; ! my $sth=$dbh->prepare($upiss); ! $sth->execute; ! $sth->finish; ! my $date='2001-04-18'; ! my $bor="$borrower->{'firstname'} $borrower->{'surname'} $borrower->{'cardnumber'}"; ! my $upitem="Update items set itemnotes='Paid for by $bor $date' where itemnumber='$itemnum'"; ! $sth=$dbh->prepare($upitem); ! $sth->execute; ! $sth->finish; ! $dbh->disconnect; ! } ! END { } # module clean-up code here (global destructor)

1 0

CVS: koha/C4/Circulation Circ2.pm,1.14,1.15
by Chris Cormack 03 Apr '01

03 Apr '01

Update of /cvsroot/koha/koha/C4/Circulation In directory usw-pr-cvs1:/tmp/cvs-serv23813/C4/Circulation Modified Files: Circ2.pm Log Message: Making a change to the way charges are handled, the system originally worked such that if a borrower owed more than $5 issues werent allowed. This worked fine except that often borrowers wish to borrows say 3 pay videos at $2 each, then 2 books say. The three pay videos rack up charges of $6 and then they cant issue the books until that is paid. Reworked so that it cares about previous charges, not the ones accrued during current issue process. Index: Circ2.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** Circ2.pm 2001/03/28 02:23:03 1.14 --- Circ2.pm 2001/04/03 21:32:37 1.15 *************** *** 187,191 **** sub issuebook { ! my ($env, $patroninformation, $barcode, $responses) = @_; my $dbh=&C4Connect; my $iteminformation=getiteminformation($env, 0, $barcode); --- 187,191 ---- sub issuebook { ! my ($env, $patroninformation, $barcode, $responses, $date) = @_; my $dbh=&C4Connect; my $iteminformation=getiteminformation($env, 0, $barcode); *************** *** 205,209 **** last SWITCH; } ! my $amount = checkaccount($env,$patroninformation->{'borrowernumber'}, $dbh); if ($amount>5) { $rejected=sprintf "Patron owes \$%.02f.", $amount; --- 205,209 ---- last SWITCH; } ! my $amount = checkaccount($env,$patroninformation->{'borrowernumber'}, $dbh,$date); if ($amount>5) { $rejected=sprintf "Patron owes \$%.02f.", $amount; *************** *** 318,321 **** --- 318,322 ---- $dateduef=$env->{'datedue'}; } + $dateduef=~ s/2001\-4\-25/2001\-4\-26/; my $sth=$dbh->prepare("insert into issues (borrowernumber, itemnumber, date_due, branchcode) values ($patroninformation->{'borrowernumber'}, $iteminformation->{'itemnumber'}, '$dateduef', '$env->{'branchcode'}')"); $sth->execute; *************** *** 643,649 **** #take borrower number #check accounts and list amounts owing ! my ($env,$bornumber,$dbh)=@_; ! my $sth=$dbh->prepare("Select sum(amountoutstanding) from accountlines where ! borrowernumber=$bornumber and amountoutstanding<>0"); $sth->execute; my $total=0; --- 644,655 ---- #take borrower number #check accounts and list amounts owing ! my ($env,$bornumber,$dbh,$date)=@_; ! my $select="Select sum(amountoutstanding) from accountlines where ! borrowernumber=$bornumber and amountoutstanding<>0"; ! if ($date ne ''){ ! $select.=" and date < '$date'"; ! } ! # print $select; ! my $sth=$dbh->prepare($select); $sth->execute; my $total=0;

1 0

CVS: koha/circ circulation.pl,1.17,1.18
by Chris Cormack 03 Apr '01

03 Apr '01

Update of /cvsroot/koha/koha/circ In directory usw-pr-cvs1:/tmp/cvs-serv23813/circ Modified Files: circulation.pl Log Message: Making a change to the way charges are handled, the system originally worked such that if a borrower owed more than $5 issues werent allowed. This worked fine except that often borrowers wish to borrows say 3 pay videos at $2 each, then 2 books say. The three pay videos rack up charges of $6 and then they cant issue the books until that is paid. Reworked so that it cares about previous charges, not the ones accrued during current issue process. Index: circulation.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/circulation.pl,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -r1.17 -r1.18 *** circulation.pl 2001/03/28 03:00:56 1.17 --- circulation.pl 2001/04/03 21:32:37 1.18 *************** *** 73,78 **** #print $query->dump; print startpage(); ! print startmenu('circulation'); ! print <<EOF --- 73,86 ---- #print $query->dump; print startpage(); ! #print startmenu('circulation'); ! my @inp=startmenu('circulation'); ! if ($query->param('module') eq 'issues' && $query->param('barcode') eq '' && $query->param('charges') eq 'yes'){ ! my $count=@inp; ! for (my $i=0;$i<$count;$i++){ ! my $bornum=$query->param('borrnumber'); ! $inp[$i]=~ s/onLoad=focusinput/onLoad=focusinput\;messenger$\"\/cgi-bin\/koha\/pay.pl?bornum=$bornum\"$\;window1.focus/; ! } ! } ! print @inp; print <<EOF *************** *** 85,89 **** </script> EOF ! if ($printer && $branch) { --- 93,97 ---- </script> EOF ! ; if ($printer && $branch) { *************** *** 226,230 **** my $barcodeentrytext= << "EOF"; ! <form method=get> <table border=0 cellpadding=5 cellspacing=0 bgcolor=#dddddd> <tr><td colspan=2 bgcolor=$headerbackgroundcolor align=center background=$backgroundimage><font color=black><b>Enter Book Barcode</b></font></td></tr> --- 234,238 ---- my $barcodeentrytext= << "EOF"; ! <form method=post action=/cgi-bin/koha/circ/circulation.pl> <table border=0 cellpadding=5 cellspacing=0 bgcolor=#dddddd> <tr><td colspan=2 bgcolor=$headerbackgroundcolor align=center background=$backgroundimage><font color=black><b>Enter Book Barcode</b></font></td></tr> *************** *** 488,492 **** } unless ($invalidduedate) { ! my ($iteminformation, $duedate, $rejected, $question, $questionnumber, $defaultanswer, $message) = issuebook(\%env, $borrower, $barcode, \%responses); unless ($iteminformation) { print << "EOF"; --- 496,502 ---- } unless ($invalidduedate) { ! my @time=localtime(time); ! my $date= (1900+$time[5])."-".($time[4]+1)."-".$time[3]; ! my ($iteminformation, $duedate, $rejected, $question, $questionnumber, $defaultanswer, $message) = issuebook(\%env, $borrower, $barcode, \%responses,$date); unless ($iteminformation) { print << "EOF"; *************** *** 506,511 **** print << "EOF" <table border=0 cellpadding=5 cellspacing=0 bgcolor=#dddddd> ! <tr><th bgcolor= background=$backgroundimage><font color=black>Error Issuing Book</font></th></tr> ! <tr><td><font color=red>$rejected</font></td></tr> </table> <br> --- 516,521 ---- print << "EOF" <table border=0 cellpadding=5 cellspacing=0 bgcolor=#dddddd> ! <tr><th><font color=black size=6>Error Issuing Book</font></th></tr> ! <tr><td><font color=red size=6>$rejected</font></td></tr> </table> <br> *************** *** 698,702 **** <input type=hidden name=branch value=$branch> <input type=hidden name=printer value=$printer> ! </form> </td> --- 708,723 ---- <input type=hidden name=branch value=$branch> <input type=hidden name=printer value=$printer> ! ! EOF ! ; ! my $amountold=$flags->{'CHARGES'}->{'message'}; ! my @temp=split(/\$/,$amountold); ! $amountold=$temp[1]; ! print "<input type=hidden name=oldamount value=$amountold>"; ! if ($flags->{'CHARGES'}){ ! print "<input type=hidden name=charges value=yes>"; ! } ! print <<EOF ! </form> </td> *************** *** 806,810 **** } else { if ($flag eq 'CHARGES') { ! $flaginfotext.="<tr><td valign=top>$flag</td><td $flags->{$flag}->{'message'} <a href=/cgi-bin/koha/pay.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this, 'Payment', 480,640)\">Payment</a></td></tr>\n"; } elsif ($flag eq 'WAITING') { my $itemswaiting=''; --- 827,831 ---- } else { if ($flag eq 'CHARGES') { ! $flaginfotext.="<tr><td valign=top>$flag</td><td> $flags->{$flag}->{'message'} <a href=/cgi-bin/koha/pay.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this, 'Payment', 480,640)\">Payment</a></td></tr>\n"; } elsif ($flag eq 'WAITING') { my $itemswaiting=''; *************** *** 838,842 **** } } ! ($flaginfotext) && ($flaginfotext="<tr><td bgcolor=$headerbackgroundcolor background=$backgroundimage colspan=2><b>Flags</b></td></tr>$flaginfotext</table>\n"); my $patrontable= << "EOF"; <table border=1 --- 859,864 ---- } } ! ($flaginfotext) && ($flaginfotext="<tr><td bgcolor=$headerbackgroundcolor background=$backgroundimage colspan=2><b>Flags</b></td></tr>$flaginfotext\n"); ! $flaginfotext.="</table>"; my $patrontable= << "EOF"; <table border=1

1 0

CVS: koha stats.pl,1.3,1.4 pay.pl,1.1.1.1,1.2
by Chris Cormack 03 Apr '01

03 Apr '01

Update of /cvsroot/koha/koha In directory usw-pr-cvs1:/tmp/cvs-serv11400 Modified Files: stats.pl pay.pl Log Message: Reworking statistics for payments and writeoffs Index: stats.pl =================================================================== RCS file: /cvsroot/koha/koha/stats.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** stats.pl 2001/02/21 22:27:59 1.3 --- stats.pl 2001/04/02 22:51:26 1.4 *************** *** 50,63 **** print mktablehdr; print mktablerow(5,'#99cc33',bold('Name'),bold('Type'),bold('Date/time'),bold('Amount'), bold('Branch'),'/images/background-mem.gif'); ! for (my $i=0;$i<$count;$i++){ ! my $hour=substr($payments[$i]{'timestamp'},8,2); ! my $min=substr($payments[$i]{'timestamp'},10,2); ! 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; --- 50,60 ---- print mktablehdr; print mktablerow(5,'#99cc33',bold('Name'),bold('Type'),bold('Date/time'),bold('Amount'), bold('Branch'),'/images/background-mem.gif'); ! my $i=0; ! while ($i<$count){ ! my $time=$payments[$i]{'datetime'}; ! my $payments=$payments[$i]{'value'}; ! my $charge=0; ! my @temp=split(/ /,$payments[$i]{'datetime'}); ! my $date=$temp[0]; my @charges=getcharges($payments[$i]{'borrowernumber'},$payments[$i]{'timestamp'}); my $count=@charges; *************** *** 66,82 **** 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'}; } --- 63,76 ---- my $temptotalres=0; my $temptotalren=0; ! my $temptotalw=0; ! for (my $i2=0;$i2<$count;$i2++){ ! $charge+=$charges[$i2]->{'amount'}; ! print mktablerow(6,'red',$charges[$i2]->{'description'},$charges[$i2]->{'accounttype'},$charges[$i2]->{'timestamp'}, $charges[$i2]->{'amount'},$charges[$i2]->{'amountoutstanding'}); ! if ($payments[$i]{'accountytpe'} ne 'W'){ if ($charges[$i2]->{'accounttype'} eq 'Rent'){ $temptotalr+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'}; } ! if ($charges[$i2]->{'accounttype'} eq 'F' || $charges[$i2]->{'accounttype'} eq 'FU' || $charges[$i2]->{'accounttype'} eq 'FN' ){ $temptotalf+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'}; } *************** *** 87,124 **** $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); ! $branch=~ s/Levi/C/; if ($branch eq 'C'){ - $levin{'total'}+=$payments[$i]{'amount'}; - $levin{'totalr'}+=$temptotalr; - $levin{'totalres'}+=$temptotalres; $levin{'totalf'}+=$temptotalf; $levin{'totalren'}+=$temptotalren; ! } ! if ($branch eq 'F'){ ! $foxton{'total'}+=$payments[$i]{'amount'}; ! $foxton{'totalr'}+=$temptotalr; ! $foxton{'totalres'}+=$temptotalres; $foxton{'totalf'}+=$temptotalf; $foxton{'totalren'}+=$temptotalren; ! } ! if ($branch eq 'S'){ ! $shannon{'total'}+=$payments[$i]{'amount'}; ! $shannon{'totalr'}+=$temptotalr; ! $shannon{'totalres'}+=$temptotalres; $shannon{'totalf'}+=$temptotalf; $shannon{'totalren'}+=$temptotalren; } ! print mktablerow(6,'white',"$payments[$i]{'firstname'} <b>$payments[$i]{'surname'}</b>" ! ,$payments[$i]{'accounttype'},"$payments[$i]{'date'} $time",$payments[$i]{'amount'} ! ,$branch); ! $oldtime=$payments[$i]{'timestamp'}; } print mktableft; --- 81,150 ---- $temptotalren+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'}; } ! } } ! ! # my $branch= ! my $hour=substr($payments[$i]{'timestamp'},8,2); ! my $min=substr($payments[$i]{'timestamp'},10,2); ! my $sec=substr($payments[$i]{'timestamp'},12,2); ! my $time="$hour:$min:$sec"; ! my $time2="$payments[$i]{'date'}"; ! my $branch=Getpaidbranch($time2,$payments[$i]{'borrowernumber'}); if ($branch eq 'C'){ $levin{'totalf'}+=$temptotalf; + $levin{'totalres'}+=$temptotalres; $levin{'totalren'}+=$temptotalren; ! $levin{'totalr'}+=$temptotalr; ! } elsif ($branch eq 'F'){ $foxton{'totalf'}+=$temptotalf; + $foxton{'totalres'}+=$temptotalres; $foxton{'totalren'}+=$temptotalren; ! $foxton{'totalr'}+=$temptotalr; ! } elsif ($branch eq 'S'){ $shannon{'totalf'}+=$temptotalf; + $shannon{'totalres'}+=$temptotalres; $shannon{'totalren'}+=$temptotalren; + $shannon{'totalr'}+=$temptotalr; } ! my $bornum=$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'}){ ! my $hour=substr($payments[$i]{'timestamp'},8,2); ! my $min=substr($payments[$i]{'timestamp'},10,2); ! my $sec=substr($payments[$i]{'timestamp'},12,2); ! my $time="$hour:$min:$sec"; ! my $time2="$payments[$i]{'date'}"; ! my $branch=Getpaidbranch($time2,$payments[$i]{'borrowernumber'}); ! ! if ($payments[$i]{'accounttype'} eq 'W'){ ! $totalw+=$payments[$i]{'amount'}; ! } else { ! $payments[$i]{'amount'}=$payments[$i]{'amount'}*-1; ! $total+=$payments[$i]{'amount'}; ! if ($branch eq 'C'){ ! $levin{'total'}+=$payments[$i]{'amount'}; ! } ! if ($branch eq 'F'){ ! $foxton{'total'}+=$payments[$i]{'amount'}; ! } ! if ($branch eq 'S'){ ! $shannon{'total'}+=$payments[$i]{'amount'}; ! } ! ! } ! # my $time2="$payments[$i]{'date'} $time"; ! ! ! print mktablerow(6,'white',"$payments[$i]{'firstname'} <b>$payments[$i]{'surname'}</b>", ! ,$payments[$i]{'accounttype'},"$payments[$i]{'date'} $time",$payments[$i]{'amount'} ! ,$branch); ! $oldtype=$payments[$i]{'accounttype'}; ! $oldtime=$payments[$i]{'timestamp'}; ! $bornum=$payments[$i]{'borrowernumber'}; ! $i++; ! ! } ! print mktablerow('6','white','','','','','',''); } print mktableft; *************** *** 137,147 **** $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; --- 163,175 ---- $foxton{'renewals'}=Count('renew','F',$date,$date2); $shannon{'renewals'}=Count('renew','S',$date,$date2); ! $levin{'unknown'}=$levin{'total'}-($levin{'totalf'}+$levin{'totalr'}+$levin{'totalres'}+$levin{'totalren'}); ! $foxton{'unknown'}=$foxton{'total'}-($foxton{'totalf'}+$foxton{'totalr'}+$foxton{'totalres'}+$foxton{'totalren'}); ! $foxton{'unknown'}=$foxton{'total'}-($foxton{'totalf'}+$foxton{'totalr'}+$foxton{'totalres'}+$foxton{'totalren'}); ! print mktablerow(10,'white',"<b>Levin</b>","Fines $levin{'totalf'}","Rental Charges $levin{'totalr'}", ! "Reserve Charges $levin{'totalres'}","Renewal Charges $levin{'totalren'}","Unknown $levin{'unknown'}","<b>Total $levin{'total'}</b>", "Issues $levin{'issues'}","Renewals $levin{'renewals'}","Returns $levin{'returns'}"); ! print mktablerow(10,'white',"<b>foxton</b>","Fines $foxton{'totalf'}","Rental Charges $foxton{'totalr'}","Reserve Charges $foxton{'totalres'}","Renewal Charges $foxton{'totalren'}","Unknown $foxton{'unknown'}","<b>Total $foxton{'total'}</b>", "Issues $foxton{'issues'}","Renewals $foxton{'renewals'}","Returns $foxton{'returns'}"); ! print mktablerow(10,'white',"<b>shannon</b>","Fines $shannon{'totalf'}","Rental Charges $shannon{'totalr'}","Reserve Charges $shannon{'totalres'}","Renewal Charges $shannon{'totalren'}","Unknown $shannon{'unknown'}","<b>Total $shannon{'total'}</b>", "Issues $shannon{'issues'}","Renewals $shannon{'renewals'}","Returns $shannon{'returns'}"); print mktableft; Index: pay.pl =================================================================== RCS file: /cvsroot/koha/koha/pay.pl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** pay.pl 2000/12/19 23:45:52 1.1.1.1 --- pay.pl 2001/04/02 22:51:26 1.2 *************** *** 35,38 **** --- 35,41 ---- } if ($temp eq 'yes'){ + $user=~ s/Levin/C/i; + $user=~ s/Foxton/F/i; + $user=~ s/Shannon/S/i; my $amount=$input->param($names[$i+4]); my $bornum=$input->param($names[$i+5]); *************** *** 43,46 **** --- 46,54 ---- } my %env; + $user=~ s/Levin/C/i; + $user=~ s/Foxton/F/i; + $user=~ s/Shannon/S/i; + + $env{'branchcode'}=$user; my $total=$input->param('total'); if ($check ==0){

1 0

CVS: koha/sec writeoff.pl,1.2,1.3
by Chris Cormack 03 Apr '01

03 Apr '01

Update of /cvsroot/koha/koha/sec In directory usw-pr-cvs1:/tmp/cvs-serv11400/sec Modified Files: writeoff.pl Log Message: Reworking statistics for payments and writeoffs Index: writeoff.pl =================================================================== RCS file: /cvsroot/koha/koha/sec/writeoff.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** writeoff.pl 2001/03/27 21:45:50 1.2 --- writeoff.pl 2001/04/02 22:51:26 1.3 *************** *** 46,49 **** --- 46,52 ---- my ($bornum,$accountnum,$itemnum,$accounttype,$amount)=@_; my $user=$input->remote_user; + $user=~ s/Levin/C/; + $user=~ s/Foxton/F/; + $user=~ s/Shannon/S/; my $dbh=C4Connect; my $env;

1 0

CVS: koha/C4 Stats.pm,1.2,1.3 Accounts2.pm,1.2,1.3
by Chris Cormack 03 Apr '01

03 Apr '01

Update of /cvsroot/koha/koha/C4 In directory usw-pr-cvs1:/tmp/cvs-serv11400/C4 Modified Files: Stats.pm Accounts2.pm Log Message: Reworking statistics for payments and writeoffs Index: Stats.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Stats.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** Stats.pm 2001/03/27 21:43:37 1.2 --- Stats.pm 2001/04/02 22:51:26 1.3 *************** *** 56,60 **** my ($env,$branch,$type,$amount,$other,$itemnum,$itemtype,$borrowernumber)=@_; my $dbh=C4Connect(); ! my $branch=$env->{'branchcode'}; my $user = $env->{'usercode'}; print $borrowernumber; --- 56,62 ---- my ($env,$branch,$type,$amount,$other,$itemnum,$itemtype,$borrowernumber)=@_; my $dbh=C4Connect(); ! if ($branch eq ''){ ! $branch=$env->{'branchcode'}; ! } my $user = $env->{'usercode'}; print $borrowernumber; *************** *** 148,161 **** my ($time)=@_; my $dbh=C4Connect; ! my $query="Select * from statistics,borrowers ! where statistics.borrowernumber= borrowers.borrowernumber ! and (statistics.type='payment' or statistics.type='writeoff')"; if ($time eq 'today'){ ! $query=$query." and datetime = now()"; } else { ! $query.=" and datetime > '$time'"; } ! # $query.=" order by timestamp"; ! print $query; my $sth=$dbh->prepare($query); $sth->execute; --- 150,171 ---- my ($time)=@_; my $dbh=C4Connect; ! my $query="Select * from accountlines,borrowers where (accounttype = 'Pay' ! or accounttype ='W') ! and accountlines.borrowernumber = borrowers.borrowernumber"; if ($time eq 'today'){ ! $query=$query." and date = now()"; } else { ! $query.=" and date='$time'"; } ! # my $query="Select * from statistics,borrowers ! # where statistics.borrowernumber= borrowers.borrowernumber ! # and (statistics.type='payment' or statistics.type='writeoff') "; ! # if ($time eq 'today'){ ! # $query=$query." and datetime = now()"; ! # } else { ! # $query.=" and datetime > '$time'"; ! # } ! $query.=" order by timestamp"; ! # print $query; my $sth=$dbh->prepare($query); $sth->execute; *************** *** 180,184 **** accounttype <> 'W'"; my $sth=$dbh->prepare($query); ! print $query,"<br>"; $sth->execute; my $i=0; --- 190,194 ---- accounttype <> 'W'"; my $sth=$dbh->prepare($query); ! # print $query,"<br>"; $sth->execute; my $i=0; *************** *** 195,201 **** sub Getpaidbranch{ ! my($date)=@_; my $dbh=C4Connect; ! my $query="select * from statistics where type='payment' and datetime='$date'"; my $sth=$dbh->prepare($query); $sth->execute; --- 205,212 ---- sub Getpaidbranch{ ! my($date,$borrno)=@_; my $dbh=C4Connect; ! my $query="select * from statistics where type='payment' and datetime ! >'$date' and borrowernumber='$borrno'"; my $sth=$dbh->prepare($query); $sth->execute; Index: Accounts2.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Accounts2.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** Accounts2.pm 2001/03/27 21:43:37 1.2 --- Accounts2.pm 2001/04/02 22:51:26 1.3 *************** *** 62,65 **** --- 62,66 ---- my $newamtos = 0; my $accdata = ""; + my $branch=$env->{'branchcode'}; my $amountleft = $data; # begin transaction *************** *** 101,105 **** $usth->execute; $usth->finish; ! UpdateStats($env,'branch','payment',$data,'','','',$bornumber); $sth->finish; $dbh->disconnect; --- 102,106 ---- $usth->execute; $usth->finish; ! UpdateStats($env,$branch,'payment',$data,'','','',$bornumber); $sth->finish; $dbh->disconnect;

1 0