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

CVS: koha/C4 Groups.pm,NONE,1.1
by Steve Tonnesen 03 May '01

03 May '01

Update of /cvsroot/koha/koha/C4 In directory usw-pr-cvs1:/tmp/cvs-serv5902/koha/C4 Added Files: Groups.pm Log Message: Steve Tonnesen's K12Admin-specific (for the time-being) group based overdue reports. --- NEW FILE --- package C4::Groups; #package to deal with Returns #written 3/11/99 by olwen(a)katipo.co.nz use strict; require Exporter; use DBI; use C4::Database; use C4::Circulation::Circ2; #use C4::Accounts; #use C4::InterfaceCDK; #use C4::Circulation::Main; #use C4::Format; #use C4::Circulation::Renewals; #use C4::Scan; use C4::Stats; #use C4::Search; #use C4::Print; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); # set the version for version checking $VERSION = 0.01; @ISA = qw(Exporter); @EXPORT = qw(&getgroups &groupmembers); %EXPORT_TAGS = ( ); # eg: TAG => [ qw!name1 name2! ], # your exported package globals go here, # as well as any optionally exported functions @EXPORT_OK = qw($Var1 %Hashit); # non-exported package globals go here #use vars qw(@more $stuff); # initalize package globals, first exported ones my $Var1 = ''; my %Hashit = (); # then the others (which are still accessible as $Some::Module::stuff) my $stuff = ''; my @more = (); # all file-scoped lexicals must be created before # the functions below that use them. # file-private lexicals go here my $priv_var = ''; my %secret_hash = (); # here's a file-private function as a closure, # callable as &$priv_func; it cannot be prototyped. my $priv_func = sub { # stuff goes here. }; # make all your functions, whether exported or not; sub getgroups { my ($env) = @_; my %groups; my $dbh=&C4Connect; my $sth=$dbh->prepare("select distinct groupshortname,grouplongname from borrowergroups"); $sth->execute; while (my ($short, $long)=$sth->fetchrow) { $groups{$short}=$long; } $dbh->disconnect; return (\%groups); } sub groupmembers { my ($env, $group) = @_; my @members; my $dbh=&C4Connect; my $q_group=$dbh->quote($group); my $sth=$dbh->prepare("select borrowernumber from borrowergroups where groupshortname=$q_group"); $sth->execute; while (my ($borrowernumber) = $sth->fetchrow) { my ($patron, $flags) = getpatroninformation($env, $borrowernumber); my $currentissues=currentissues($env, $patron); $patron->{'currentissues'}=$currentissues; push (@members, $patron); } return (\@members); } END { } # module clean-up code here (global destructor)

1 0

CVS: koha-html/intranet-html/images overdues.jpg,NONE,1.1
by Steve Tonnesen 03 May '01

03 May '01

Update of /cvsroot/koha/koha-html/intranet-html/images In directory usw-pr-cvs1:/tmp/cvs-serv5634/koha-html/intranet-html/images Added Files: overdues.jpg Log Message: Header graphic used by Steve Tonnesen's K12Admin-specific class overdue printouts. --- NEW FILE --- ÿØÿà ÿÄ !1"a#$A2Q3BÿÄ ?zª-µA2E8U4!DÇ9J<ÕýÝÜC¡ZÛ¶_4ŸU:œ%HÅ@GÔ¡ÅbZAcW¥îŽTrR²FB&)ûyÊfêœ×Ó1=¬ÃÛÜâbLVñ5Ô¬ÇñärQd{°")]l â«Ë599C;5ŒYÅµú³œ~ââ²zçYk\j{OºžÜ¶ŒÔ¡ìÙS ÙlÁÁ$Wu6y*ºY7AZŒ#ÈÒŒ5æªÈe>QÒµzÒÞœ*ó¬>8Šü}Yå ¬oà3¹lä^`}@}(µáÛøyÍ€Éhó5+žB ÁÎªÉT h¬G¯@EtÎIåœª8xþÓbòýêþÒšuCëvÉ^18$îÂ8æÍ~ß6ÛkäÊÈû b°øÂ%.ko€RrZ*keóóIgIgÕjsaE° c6<.2î$2}Ä<¥ïÛ³œ,ý7i€n{<}úþé (ª€í¡è7XáÛÈEª'M)¿í Ïõ3QrçO,ZÊV+fp8ÅnóÃ&cRÆ0¢@)öOdý3Ðö;êãX£ãQA4YCÒ&&ÑOÛ (€õ}2þáÅäZUŠ@D±@²J;q®²~Œ% -G>ÒÐ~ (ÊÍØ÷¹ úâÞvŒüHSXMÇ0xP( #ieÇåpM~µáâ[#Äãµ&?L÷¢Z°Z.ÃÎÓu\4@2 HdÜ<<rKTNÉŒ,íô©ä@=p8äht¥ÛÜ£žº£Sœç<{)sD jB5Ôb,0ªÁÌÔRäsN@¹HÝŠNÝŠR9VKùðOcÈbŽ kzÞ>ËU³Ê=9ä¯3V·Yåj»Il×H'¬±;ÆêÇT$DuÜ+ªžä ¶ÌTì|Áôã9¥tã8ttã8ttãUãÔ³Öc:bÑuÚªÿ ÆJÄ6]E¡xª²úÃ?}CØ©øùÊÙ{šíaî÷7l4¿hŸ »C£ûaî]>Ô÷··µ4XêÛÅ õÆ#SeäÎe²Ò-LN õÇ0ï·Rµ~G7u»=üUûR^ÇÛXLÞÕi!Ežrx¯>'èVfnQFN¥ÜsnŒzµ÷sÆ0¯çü;¶ÀVî,MÕÄ×gÅOöòkÃ5ªçpaND° Qqç¬7X$D2®€çz{Aa¡Yš ²fýÆ'€1ªçL£ùmæ%î ±FS|üQéÉdô{{§¢»rSPà2mÇîW«.BcÓvxÌØžX© 'nTaf{fû€ñJ§ðX#Gžûìçýºžo¬VLgHW-¥XG±žÆTç*<J=ÅFY1ÂØDKØªÉGÿ èª/+-)ŠÉ6¯;EUìÖ¶Rò¹JU;Ü»5zîã3ÊG+(çpàrþ¡XÚü?Ú ·ÛñãØùêØÜÐ£Ô-(Žê¶R}œaCÁ±uçØ,÷nÕxý8Õ§D/ÝÕ¶ªóÚNŽÆŸOœ3fðè*øèjœcežÝoÔ}Ax°(+&\ŸNä¥È''¬UbñÓTD§"*ÏÈ šÇÄ±F`ImÆÛ±ºóá*9GßäÔ\L¹KÐ¬/ªWÊœyý>Õ$ Ý€[ÇKÁN°"dÓlý·}ä äâ"õÖÕôQŸÐkýÂ¥òG®ýá6sl·Øó«MnÇ]nì&`¡)¯yÜ&ñ&šÖ*Ï\®ßF^í|Q®Z|ß'lÔ\Ô¯3åKjÊ§n ®©¹#h«X)Älâ€ã ?³?vihGO5«§ŽsWÑ>GDv%«²p.®ÔyðÁ`±yx&¯4ííÝM~ívY¯O ZÊÇº /æ,&:ª»ÖÈ=9r U}hcÕã ÌªÂÛñ-#7/}0]¶tVÊûoªø!ØÇæÍÁ8D S}»#å-2GÄà)Áv=àÀ `DJ =þCŸFÆù_f:}óä:VL€Ë$u£-Ô;4=®· j%g5ñìs&ªj$¡ppMDÎüNC "r ?Lû°&cÁÅyü²&há%ãÙË.íÒH S75~¥Ø.ÿ fl=ê~ÑgQvßAé,E\SXåòjm1¡Ñtiac§4æÕXä,óœÉ·/Ë4ÓiMn7a¹jyº ci9³lL@-ô[°H ÒÏŠÓ¢¢ãåA%r4èÆCBGŽ|k6è6fÈ€ÜÔý£àJåh vËö<ëK)åqûìúHT0$y»¡vÄÈ€u>®jÂ*H¢àÞ¡{[CGjüm©²ù«yT5Ð4ÕÚzygœ³U7h-ù#¿?u ©XáZŒö+8ÆÈGæVªº°cù]øùØ~|×;£ -é©)Ž0ôžbž2óøûùæóRöd{mªs>+ŒÞ(¯ÜE]©ÕU²Yê2lÜšÍÜu UäÖÏU£²m.€n¡ ªg!a_Óÿ pBSÖb+{ilzQÇ"šxÏìÊÄ #¯ººIX\&Ýcaç}9ÚBÞÜgÀ}HäVnšÝáüÄÊ6,ñÌAmw€QŠciR(®êZ!FË€*å¿Hš`ÑÒÏÍä-I%[x·ÇED®É/¥<+é8xÄª zÎ€Ã¥4àIš²{·Øoìß}Œíïä~zë)sœÑñÄ«NB¹Uh!Ýíåa¬AŽ>ŠZiÛ&w)L!îž/p)> ÈÔ¬×w!Ø÷ßaÓ)ÅFy&: >þ`¶??Û©b×>=5õÉËX<p°1öÌåáE¬/=ÄÄþýEåä_Ýÿ R$Ü( ~ 3ÉZÝK10hæ¯<,E"áÛpw:$ÑÈªèà«#ÊÀûàçš²éÑéŸ×}Èï²|åî/OôbÒdÅVÌÈ¹$ÝÂlH'ï$Ê¢%*+,J*CIxJ¯PøšÖ»¯¯Y1vðñòÌlÔ«)Ý"ÕÑÛ3pk<RT±ïßG9n©hí×-\ ªjv¶»¬µnKQ.®¿©3võDsÃf<üù+Ojà ï Ó/¯@HR'D0#U>Zð$&ºÃÀA ïºí±ßîO|=UûýXà²â`Ú«~ÿ 3xk®ÝGŽ»¬u^DÒ7õjáÆÉÔ~c%jQVx g<€,ñR³le«€-xc^`ÙrÜÇñíúëô×ôØë×OÜÄž2U»$Ü£t #Xð`Åe an¡Ø"žUA4Ÿ€*dp)Þ)R²ËÔ;§fŸu&ÀrX'=@dpYzu¶;Ûoi¢Y¢¢-'ërbC£²&¢$bšÒAÎ¿nå¢ê¢w®±ËÛÈ®^ÖJìù4tt¿-^Ò4ôøLÌ]~ÈªBšð ,G§Šš¡¡@S¿Ÿãmÿ éQá@`*]î£a°?ûýýþýiFÕz?uc2eNKÃ¹jãÛŠOŸ€Ç ÂJ·)$åGÖë8b«µUYÆî ÅOôÌlÕ4POè5sÒšØjçvÊ6ç^ÀI4dÁÁd.Ù.G(plìbšL)@Å7î)ß<qÎËÊÍ\§/-3nW`8³oÉÀ#ßÜôãpñÿ H43c»fÁ^u"¥ýÒÿ £`¿

1 0

CVS: koha/C4/Circulation Circ2.pm,1.16,1.17
by Steve Tonnesen 02 May '01

02 May '01

Update of /cvsroot/koha/koha/C4/Circulation In directory usw-pr-cvs1:/tmp/cvs-serv32680/koha/C4/Circulation Modified Files: Circ2.pm Log Message: Added an overdue variable to the itemdata returned by the currentissues subroutine. This makes it easier to pick out overdue items in other modules (ie circulation, reports, etc.) Index: Circ2.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** Circ2.pm 2001/05/02 21:15:22 1.16 --- Circ2.pm 2001/05/02 22:38:26 1.17 *************** *** 636,640 **** --- 636,647 ---- $data->{'dewey'}=~s/0*$//; ($data->{'dewey'} == 0) && ($data->{'dewey'}=''); + my @datearr = localtime(time()); + my $todaysdate = (1900+$datearr[5]).sprintf ("%0.2d", ($datearr[4] + +1)).sprintf ("%0.2d", $datearr[3]); my $datedue=$data->{'date_due'}; + $datedue=~s/-//g; + if ($datedue < $todaysdate) { + $data->{'overdue'}=1; + } my $itemnumber=$data->{'itemnumber'}; $currentissues{$counter}=$data;

1 0

CVS: koha-html/intranet-html/images create-man-credit.gif,NONE,1.1 create-man-invoice.gif,NONE,1.1
by Chris Cormack 02 May '01

02 May '01

Update of /cvsroot/koha/koha-html/intranet-html/images In directory usw-pr-cvs1:/tmp/cvs-serv13474/intranet-html/images Added Files: create-man-credit.gif create-man-invoice.gif Log Message: Images for the manual invoice and manual credit buttons, plus a little mod to the circulation include --- NEW FILE --- GIF89aÛ V(ÉbJZ¯ØìUªíz¿à°xL.± ÅI\8ž|N¯ÛïøŒ~Ïïûÿ Sn'¥Š§š©ª«¬±²³Žµ¶·ž¹º)¿ÀÁÂÃÄÅ)ÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÍ)ÆàáâãäÃ)èéêëìíîïðñòóôõö÷øùúë) þÿ aÀÀÎq6L Ñ£H8p²å€P£JjªU(&@p¢ÂÕ¯` ð*u§Ah {5£¡ÖV Ëi xóê%àÖ@^ö Lx¯Â ¢ 8Ä##~<8Ã(œ¡.HŒÞ€ðRÞ¬·×ÓšQsú4×cËÝÚíÛÈ.\š» Øž§ífvÜÞ2ÇÝYvñåS4Nœz(Õ©û®æÁ ÓœÏ¥ð »xßš¯I}z ßå³W*>wc«¿bö5OX×{äQwÞéQÿ| ,×@Aè_ŸIh]nqGwôiÈà º è±c 1àXVxžaÙPrìŽZ/® |^9çÜ9tšÝU tì?åeéžSÎ^ÐYîžFÙNð2hñEQ<^ 3¯»è»g5¿UÀýhX_zò¿ÿ~íÝ¶WQSUp©uÔŒe¹µFÑÏÀulQž¢8À(lÖ"@øo@ ]h¿<å(üÃÊ"E~Ä þ¢¬ýEðöa]ìò/;là)Ãâðéf@©¡®I)f¹!Ìßte7äÇ^&ÝÈFM*e²É0er(Òbv:8i,sà!EŠ³ÿ4$HÌžü£Sñò·âž¢7.ÉAøGôÈåJÃÀ?þØ¬@À x "ÖxÈ°ñ<ã!ÐÈJÑÒn@£ŠÚøÈMgº ºÔ2Ý)5ª zÊäšHMªR]8õ©PªT§JUªŠàXÍªV·ÊÕ®zÕ«F]ªXÇJÖ¥ŠàhM«Z×ÊÖ¶ºÕ)(\çJ×ºÚõ®xÍ«^÷Ê×Ÿúõ¯ ¬`KØºŠ@eM¬bK €`¬d'KÙÊZö²Í¬f7ËÙÎzö³ hG+Ù.ö4Mj÷ Ã¹-]a!ÛÚÚö¶žÍm^quðo pKÜâ÷žTP~æ:÷¹ÐîsàH÷º ØÍ®v¡Ë --- NEW FILE --- GIF89aÛ Z"ÊbJZ¯ØìUªíz¿à°xL.±HÄI`8ž|N¯ÛïøŒ~Ïïûÿ Sn'Š§š©ª«¬±²³Žµ¶·ž¹º²)ÀÁÂÃÄÅÆ)ËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÎ)ÇáâãäåÄ)éêëìíîïðñòóôõö÷øùúûì) ÿ Äà³šÑ£EC!]Ê iäX©€{AAD 4Y`dL A °¥ Z0å$IÚï¥i¥nL) `ð@I^ Šdé%|Ÿ¹äVþ§ p&i¢ °`/pàD»<Ê«¯ðè¢À)º[pÀ/ iÂ/Œ. -@c4µÙjŒ×X"w6@tsæŒy?bck«Ðög¬Õäöc»MAÝ<î÷ct¯Öødq³ÐÙXr=s0XÿY("f:bdbEènz\Ñd@/Vi«ßë/Yê¬g@üï¹EÀëd OÖ``ü[ñ%ýYÄÊº\:!E QAìŽO&<pMDñTëNå3Jbe8°XyZ ?O`a@üvòŸŠd~`b )ó3ØL&Ã Úð=¡XÐ S(D`EC5áÐj8$4€RIÀ^"²ÿ,*"baÆý# tdy$4(È:B¡u4I9HGc(¥£4ªlËq l¯Tq' QÜ |ÍâÀ>#°6^=ªPºÚr\a'dâz ÄÓöÜ¡:ÏîÿýÄ2®ñdã!ÆC¢12¥ÞL·1ªÔ¥1éJ«1SgôtëPJÔ¢ "»HªRÊÔŠ:õ©OMÁ'ŠJÕªZõªXÍjVjÔ®zõ«CMÁÆJÖ²õ¬hMkZSP¶ºõp«\çJ×ºÚõ®xÍ«^÷Ê×Ÿúõ¯pMÁÀJØÂ¶HÀØÆ:ö±¬d'KÙÊZö²Í¬f7ËÙÎz¶±QÉ(asØÒvÈÜ¬

3 5

CVS: koha-html/intranet-html/includes circulation-top.inc,1.2,1.3
by Chris Cormack 02 May '01

02 May '01

Update of /cvsroot/koha/koha-html/intranet-html/includes In directory usw-pr-cvs1:/tmp/cvs-serv13474/intranet-html/includes Modified Files: circulation-top.inc Log Message: Images for the manual invoice and manual credit buttons, plus a little mod to the circulation include Index: circulation-top.inc =================================================================== RCS file: /cvsroot/koha/koha-html/intranet-html/includes/circulation-top.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** circulation-top.inc 2001/02/14 00:30:08 1.2 --- circulation-top.inc 2001/05/02 21:32:21 1.3 *************** *** 1,117 **** ! <!doctype html public "-//w3c//dtd html 4.0 transitional//en"> !  !  !  !  ! ! ! <html> ! <head> ! <title>KOHA: INTRANET: Circulation</title> ! ! <style type="text/css"> !  ! ! </style> ! ! <SCRIPT LANGUAGE="JavaScript"> !  ! ! ! </script> ! ! </head> ! <body text="black" bgcolor="white" link="#0000ff" vlink="#0000ff" "3366cc" Alink="#cc3300" ! marginheight=0 marginwidth=0 leftmargin=0 topmargin=0 onLoad=focusinput()> ! ! ! !  ! !  ! ! <table cellpadding=0 cellspacing=0 width="100%" border=0> ! <tr bgcolor="#990000"> ! ! <td valign=top> ! <table cellpadding=0 cellspacing=0 border=0 height=29> ! <tr valign=top bgcolor="#990000"> ! <td background="/images/catalogue-spot-1.gif" width="224" ! height="29"><font size=1 face="arial"><img src="/images/holder.gif" width=210 height=4 alt=" " hspace=0 vspace=0><br> ! <img src="/images/holder.gif" ! width=35 height=21 align=left alt=" " hspace=0 vspace=0>KOHA: <A HREF="/">HLT INTRANET</A><br> ! <img src="/images/holder.gif" width=210 height=1 alt=" " hspace=0 vspace=0></FONT></td> ! ! </TR></TABLE></TD> ! ! ! ! <td valign=bottom align=right><img src="/images/holder.gif" ! WIDTH=1 HEIGHT=38 HSPACE=0 vspace=0></td> ! ! <td valign=bottom align=right> ! <table cellpadding=0 cellspacing=0 border=0 height=29><tr><td><img src=/images/crc-crc.gif border="0" name=menu usemap="#map" HSPACE=0 vspace=0 ></td> ! ! </TR></TABLE></TD> ! </tr> ! ! <TR VALIGN=TOP BGCOLOR="000000"><TD COLSPAN=3><img src="/images/blackdot.gif" WIDTH=1 HEIGHT=2 HSPACE=0 vspace=0></TD></TR> ! ! </table> ! ! ! <map name="map"> ! <area shape="rect" coords="18,8,84,27" href="/catalogue/" alt="Catalogue" onMouseOver="if(document.images)document.menu.src='/images/mem-cat.gif'" onMouseOut="if(document.images)document.menu.src='/images/mem-mem.gif'"> ! ! <area shape="rect" coords="94,8,154,28" href="/members/" alt="Members" onMouseOver="if(document.images)document.menu.src='/images/mem-mem.gif'" onMouseOut="if(document.images)document.menu.src='/images/mem-mem.gif'"> ! ! <area shape="rect" coords="165,9,233,29" alt="Acquisitions" href="/acquisitions/" onMouseOver="if(document.images)document.menu.src='/images/mem-acq.gif'" onMouseOut="if(document.images)document.menu.src='/images/mem-mem.gif'"> ! ! <area shape="rect"alt="Reports" coords="237,7,296,27"href="/reports/" onMouseOver="if(document.images)document.menu.src='/images/mem-rep.gif'" onMouseOut="if(document.images)document.menu.src='/images/mem-mem.gif'"> ! ! ! <area shape="poly" alt="Circulation" coords="319,26,314,12,303,7,324,2,350,2,374,11,383,19,386,29" href="/circulation/" onMouseOver="if(document.images)document.menu.src='images/cat-crc.gif'" onMouseOut="if(document.images)document.menu.src='images/cat-cat.gif'"> ! ! ! <area shape="poly" alt="Home" coords="373,7,399,0,422,0,443,9,455,19,457,27,389,27,381,11,372,8,373,8,373,8,372,6" href="/" onMouseOver="if(document.images)document.menu.src='images/cat-hom.gif'" onMouseOut="if(document.images)document.menu.src='images/cat-cat.gif'"> ! ! ! <area shape="default" nohref> ! </map> ! ! <BLOCKQUOTE> --- 1,114 ---- ! <!doctype html public "-//w3c//dtd html 4.0 transitional//en"> !  !  !  !  ! ! ! <html> ! <head> ! <title>KOHA: INTRANET: Circulation</title> ! ! <style type="text/css"> !  ! ! </style> ! ! <SCRIPT LANGUAGE="JavaScript"> !  ! ! ! </script> ! ! </head> ! <body text="black" bgcolor="white" link="#0000ff" vlink="#0000ff" "3366cc" Alink="#cc3300" ! marginheight=0 marginwidth=0 leftmargin=0 topmargin=0 ! onLoad=focusinput()> ! ! ! ! !  ! !  ! ! <table cellpadding=0 cellspacing=0 width="100%" border=0> ! <tr bgcolor="#990000"> ! ! <td valign=top> ! <table cellpadding=0 cellspacing=0 border=0 height=29> ! <tr valign=top bgcolor="#990000"> ! <td background="/images/catalogue-spot-1.gif" width="224" ! height="29"><font size=1 face="arial"><img src="/images/holder.gif" width=210 height=4 alt=" " hspace=0 vspace=0><br> ! <img src="/images/holder.gif" ! width=35 height=21 align=left alt=" " hspace=0 vspace=0>KOHA: <A HREF="/">HLT INTRANET</A><br> ! <img src="/images/holder.gif" width=210 height=1 alt=" " hspace=0 vspace=0></FONT></td> ! ! </TR></TABLE></TD> ! ! ! ! <td valign=bottom align=right><img src="/images/holder.gif" ! WIDTH=1 HEIGHT=38 HSPACE=0 vspace=0></td> ! ! <td valign=bottom align=right> ! <table cellpadding=0 cellspacing=0 border=0 height=29><tr><td><img src=/images/crc-crc.gif border="0" name=menu usemap="#map" HSPACE=0 vspace=0 ></td> ! ! </TR></TABLE></TD> ! </tr> ! ! <TR VALIGN=TOP BGCOLOR="000000"><TD COLSPAN=3><img src="/images/blackdot.gif" WIDTH=1 HEIGHT=2 HSPACE=0 vspace=0></TD></TR> ! ! </table> ! ! ! <map name="map"> ! <area shape="rect" coords="18,8,84,27" href="/catalogue/" alt="Catalogue" onMouseOver="if(document.images)document.menu.src='/images/crc-cat.gif'" onMouseOut="if(document.images)document.menu.src='/images/crc-crc.gif'"> ! ! <area shape="rect" coords="94,8,154,28" href="/members/" alt="Members" onMouseOver="if(document.images)document.menu.src='/images/crc-mem.gif'" onMouseOut="if(document.images)document.menu.src='/images/crc-crc.gif'"> ! ! <area shape="rect" coords="165,9,233,29" alt="Acquisitions" href="/acquisitions/" onMouseOver="if(document.images)document.menu.src='/images/crc-acq.gif'" onMouseOut="if(document.images)document.menu.src='/images/crc-crc.gif'"> ! ! <area shape="rect"alt="Reports" coords="237,7,296,27"href="/reports/" onMouseOver="if(document.images)document.menu.src='/images/crc-rep.gif'" onMouseOut="if(document.images)document.menu.src='/images/crc-crc.gif'"> ! ! ! <area shape="poly" alt="Circulation" coords="319,26,314,12,303,7,324,2,350,2,374,11,383,19,386,29" href="/cgi-bin/koha/circ/circulation.pl" onMouseOver="if(document.images)document.menu.src='/images/crc-crc.gif'" onMouseOut="if(document.images)document.menu.src='/images/crc-crc.gif'"> ! ! ! <area shape="poly" alt="Home" coords="373,7,399,0,422,0,443,9,455,19,457,27,389,27,381,11,372,8,373,8,373,8,372,6" href="/" onMouseOver="if(document.images)document.menu.src='/images/crc-hom.gif'" onMouseOut="if(document.images)document.menu.src='/images/crc-crc.gif'"> ! ! ! <area shape="default" nohref> ! </map> ! ! <BLOCKQUOTE>

1 0

CVS: koha/C4/Circulation Circ2.pm,1.15,1.16
by Chris Cormack 02 May '01

02 May '01

Update of /cvsroot/koha/koha/C4/Circulation In directory usw-pr-cvs1:/tmp/cvs-serv9030/C4/Circulation Modified Files: Circ2.pm Log Message: Fixed the code that adds a credit or wipes a lost book charge from a borrowers account if said book is returned Index: Circ2.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** Circ2.pm 2001/04/03 21:32:37 1.15 --- Circ2.pm 2001/05/02 21:15:22 1.16 *************** *** 206,210 **** } my $amount = checkaccount($env,$patroninformation->{'borrowernumber'}, $dbh,$date); ! if ($amount>5) { $rejected=sprintf "Patron owes \$%.02f.", $amount; last SWITCH; --- 206,214 ---- } my $amount = checkaccount($env,$patroninformation->{'borrowernumber'}, $dbh,$date); ! if ($amount>5 && $patroninformation->{'categorycode'} ne 'L' && ! $patroninformation->{'categorycode'} ne 'W' && ! $patroninformation->{'categorycode'} ne 'I' ! && $patroninformation->{'categorycode'} ne 'B' && ! $patroninformation->{'categorycode'} ne 'P') { $rejected=sprintf "Patron owes \$%.02f.", $amount; last SWITCH; *************** *** 341,344 **** --- 345,355 ---- } + sub updateitemlost{ + my ($dbh,$itemno)=@_; + my $query="update items set itemlost=0 where itemnumber=$itemno"; + my $sth=$dbh->prepare($query); + $sth->execute; + $sth->finish; + } sub returnbook { *************** *** 353,356 **** --- 364,368 ---- my ($currentborrower) = currentborrower($env, $iteminformation->{'itemnumber'}, $dbh); updatelastseen($env,$dbh,$iteminformation->{'itemnumber'}); + updateitemlost($dbh,$iteminformation->{'itemnumber'}); if ($currentborrower) { ($borrower)=getpatroninformation($env,$currentborrower,0); *************** *** 376,381 **** } $sth->finish; # check for charge made for lost book ! $sth=$dbh->prepare("select * from accountlines where (borrowernumber=$borrower->{'borrowernumber'}) and (itemnumber = $iteminformation->{'itemnumber'}) and (accounttype='L')"); $sth->execute; if (my $data = $sth->fetchrow_hashref) { --- 388,399 ---- } $sth->finish; + } + if ($iteminformation->{'itemlost'} eq '1'){ # check for charge made for lost book ! my $query="select * from accountlines where (itemnumber = ! $iteminformation->{'itemnumber'}) and (accounttype='L' or accounttype='Rep') ! order by date desc"; ! # print $query; ! $sth=$dbh->prepare($query); $sth->execute; if (my $data = $sth->fetchrow_hashref) { *************** *** 385,388 **** --- 403,407 ---- my $acctno = $data->{'accountno'}; my $amountleft; + # print $amount; if ($data->{'amountoutstanding'} == $amount) { $offset = $data->{'amount'}; *************** *** 394,409 **** my $uquery = "update accountlines set accounttype = 'LR',amountoutstanding='0' ! where (borrowernumber = $borrower->{'borrowernumber'}) and (itemnumber = $iteminformation->{'itemnumber'}) and (accountno = '$acctno') "; my $usth = $dbh->prepare($uquery); $usth->execute(); $usth->finish; ! my $nextaccntno = C4::Accounts::getnextacctno($env,$borrower->{'borrowernumber'},$dbh); $uquery = "insert into accountlines (borrowernumber,accountno,date,amount,description,accounttype,amountoutstanding) ! values ($borrower->{'borrowernumber'},$nextaccntno,now(),0-$amount,'Book Returned', 'CR',$amountleft)"; $usth = $dbh->prepare($uquery); $usth->execute; $usth->finish; --- 413,431 ---- my $uquery = "update accountlines set accounttype = 'LR',amountoutstanding='0' ! where (borrowernumber = $data->{'borrowernumber'}) and (itemnumber = $iteminformation->{'itemnumber'}) and (accountno = '$acctno') "; + # print $uquery; my $usth = $dbh->prepare($uquery); $usth->execute(); $usth->finish; ! my $nextaccntno = getnextacctno($env,$data->{'borrowernumber'},$dbh); ! my $desc="Book Returned ".$iteminformation->{'barcode'}; $uquery = "insert into accountlines (borrowernumber,accountno,date,amount,description,accounttype,amountoutstanding) ! values ($data->{'borrowernumber'},$nextaccntno,now(),0-$amount,'$desc', 'CR',$amountleft)"; $usth = $dbh->prepare($uquery); + # print $uquery; $usth->execute; $usth->finish; *************** *** 414,420 **** $usth->execute; $usth->finish; } $sth->finish; ! } my ($resfound,$resrec) = find_reserves($env, $dbh, $iteminformation->{'itemnumber'}); if ($resfound eq 'y') { --- 436,446 ---- $usth->execute; $usth->finish; + $uquery="update items set itemnotes='' where itemnumber=$iteminformation->{'itemnumber'}"; + $usth = $dbh->prepare($uquery); + $usth->execute; + $usth->finish; } $sth->finish; ! } my ($resfound,$resrec) = find_reserves($env, $dbh, $iteminformation->{'itemnumber'}); if ($resfound eq 'y') { *************** *** 600,604 **** } my $select="select * from issues,items,biblioitems,biblio where ! borrowernumber=$borrowernumber and issues.itemnumber=items.itemnumber and items.biblionumber=biblio.biblionumber and items.biblioitemnumber=biblioitems.biblioitemnumber and returndate is null --- 626,630 ---- } my $select="select * from issues,items,biblioitems,biblio where ! borrowernumber='$borrowernumber' and issues.itemnumber=items.itemnumber and items.biblionumber=biblio.biblionumber and items.biblioitemnumber=biblioitems.biblioitemnumber and returndate is null

1 0

CVS: koha/C4 Accounts2.pm,1.5,1.6
by Chris Cormack 02 May '01

02 May '01

Update of /cvsroot/koha/koha/C4 In directory usw-pr-cvs1:/tmp/cvs-serv8720/C4 Modified Files: Accounts2.pm Log Message: Added functions to add credits and invoices to borrowers account Index: Accounts2.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Accounts2.pm,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** Accounts2.pm 2001/05/01 23:24:50 1.5 --- Accounts2.pm 2001/05/02 21:13:15 1.6 *************** *** 16,20 **** @ISA = qw(Exporter); ! @EXPORT = qw(&recordpayment &fixaccounts &makepayment); %EXPORT_TAGS = ( ); # eg: TAG => [ qw!name1 name2! ], --- 16,20 ---- @ISA = qw(Exporter); ! @EXPORT = qw(&recordpayment &fixaccounts &makepayment &manualinvoice); %EXPORT_TAGS = ( ); # eg: TAG => [ qw!name1 name2! ], *************** *** 197,201 **** $sth->execute; $sth->finish; ! my @datearr = localtime($time); my $date = (1900+$datearr[5])."-".($datearr[4]+1)."-".$datearr[3]; my $bor="$borrower->{'firstname'} $borrower->{'surname'} $borrower->{'cardnumber'}"; --- 197,201 ---- $sth->execute; $sth->finish; ! my @datearr = localtime(time); my $date = (1900+$datearr[5])."-".($datearr[4]+1)."-".$datearr[3]; my $bor="$borrower->{'firstname'} $borrower->{'surname'} $borrower->{'cardnumber'}"; *************** *** 207,209 **** --- 207,290 ---- } + sub manualinvoice{ + my ($bornum,$itemnum,$desc,$type,$amount)=@_; + my $dbh=C4Connect; + my $insert; + $itemnum=~ s/ //g; + my $accountno=getnextacctno('',$bornum,$dbh); + my $amountleft=$amount; + + if ($type eq 'C' || $type eq 'BAY'){ + my $amount2=$amount*-1; + $amountleft=fixcredit('',$bornum,$amount2); + } + if ($type eq 'N'){ + $desc.="New Card"; + } + if ($type eq 'L' && $desc eq ''){ + $desc="Lost Item"; + } + if ($itemnum ne ''){ + my $sth=$dbh->prepare("Select * from items where barcode='$itemnum'"); + $sth->execute; + my $data=$sth->fetchrow_hashref; + $sth->finish; + $desc.=" ".$itemnum; + $insert="insert into accountlines (borrowernumber,accountno,date,amount,description,accounttype,amountoutstanding,itemnumber) + values ($bornum,$accountno,now(),'$amount','$desc','$type','$amountleft','$data->{'itemnumber'}')"; + } else { + $insert="insert into accountlines (borrowernumber,accountno,date,amount,description,accounttype,amountoutstanding) + values ($bornum,$accountno,now(),'$amount','$desc','$type','$amountleft')"; + } + + my $sth=$dbh->prepare($insert); + $sth->execute; + $sth->finish; + + $dbh->disconnect; + } + + sub fixcredit{ + #here we update both the accountoffsets and the account lines + my ($env,$bornumber,$data)=@_; + my $dbh=C4Connect; + my $updquery = ""; + my $newamtos = 0; + my $accdata = ""; + # my $branch=$env->{'branchcode'}; + my $amountleft = $data; + # begin transaction + my $nextaccntno = getnextacctno($env,$bornumber,$dbh); + # get lines with outstanding amounts to offset + my $query = "select * from accountlines + where (borrowernumber = '$bornumber') and (amountoutstanding<>0) + order by date"; + my $sth = $dbh->prepare($query); + $sth->execute; + # offset transactions + while (($accdata=$sth->fetchrow_hashref) and ($amountleft>0)){ + if ($accdata->{'amountoutstanding'} < $amountleft) { + $newamtos = 0; + $amountleft = $amountleft - $accdata->{'amountoutstanding'}; + } else { + $newamtos = $accdata->{'amountoutstanding'} - $amountleft; + $amountleft = 0; + } + my $thisacct = $accdata->{accountno}; + $updquery = "update accountlines set amountoutstanding= '$newamtos' + where (borrowernumber = '$bornumber') and (accountno='$thisacct')"; + my $usth = $dbh->prepare($updquery); + $usth->execute; + $usth->finish; + $updquery = "insert into accountoffsets + (borrowernumber, accountno, offsetaccount, offsetamount) + values ($bornumber,$accdata->{'accountno'},$nextaccntno,$newamtos)"; + my $usth = $dbh->prepare($updquery); + $usth->execute; + $usth->finish; + } + $sth->finish; + $dbh->disconnect; + return($amountleft); + } END { } # module clean-up code here (global destructor)

1 0

CVS: koha boraccount.pl,1.1.1.1,1.2 moremember.pl,1.5,1.6
by Chris Cormack 02 May '01

02 May '01

Update of /cvsroot/koha/koha In directory usw-pr-cvs1:/tmp/cvs-serv8060 Modified Files: boraccount.pl moremember.pl Log Message: Turned off the tidy accounts feature in the view accounts screen (boraccount.pl) And got it so outstanding credits are shown on the moremember.pl (view member screen) Index: boraccount.pl =================================================================== RCS file: /cvsroot/koha/koha/boraccount.pl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** boraccount.pl 2000/12/19 23:45:51 1.1.1.1 --- boraccount.pl 2001/05/02 21:11:41 1.2 *************** *** 28,31 **** --- 28,33 ---- print <<printend <FONT SIZE=6><em>Account for $data->{'firstname'} $data->{'surname'}</em></FONT><P> + <a href=/cgi-bin/koha/maninvoice.pl?bornum=$bornum><image src=/images/create-man-invoice.gif border=0></a> +   <a href=/cgi-bin/koha/mancredit.pl?bornum=$bornum><image src=/images/create-man-credit.gif border=0></a> <center> <p> *************** *** 35,42 **** <td bgcolor="99cc33" background="/images/background-mem.gif" colspan=1><B>AMOUNT</TD> <td bgcolor="99cc33" background="/images/background-mem.gif" colspan=1><B>STILL OWING</TD> - <td bgcolor="99cc33" background="/images/background-mem.gif" colspan=1><B>FIX</B></TD> </TR> - <form method=post action=tidyaccounts.pl> printend ; --- 37,42 ---- *************** *** 58,62 **** <td>$accts->[$i]{'amount'}</td> <TD>$accts->[$i]{'amountoutstanding'}</td> - <td><input type=text size=5 name=$accts->[$i]{'accountno'} value="$accts->[$i]{'amount'}"></td> </tr> printend --- 58,61 ---- *************** *** 71,85 **** </tr> - - - - </table> - <input type=hidden name=bornum value=$bornum> - <input type=submit value="Tidy Accounts"> - </form> - - - <br clear=all> <p>   </p> --- 70,74 ---- Index: moremember.pl =================================================================== RCS file: /cvsroot/koha/koha/moremember.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** moremember.pl 2001/03/29 02:11:36 1.5 --- moremember.pl 2001/05/02 21:11:41 1.6 *************** *** 122,126 **** my $amount= $accts->[$i]{'amount'} + 0.00; my $amount2= $accts->[$i]{'amountoutstanding'} + 0.00; ! if ($amount2 > 0){ print "<tr VALIGN=TOP >"; my $item="   "; --- 122,126 ---- my $amount= $accts->[$i]{'amount'} + 0.00; my $amount2= $accts->[$i]{'amountoutstanding'} + 0.00; ! if ($amount2 != 0){ print "<tr VALIGN=TOP >"; my $item="   ";

1 0

CVS: koha maninvoice.pl,NONE,1.1 mancredit.pl,NONE,1.1
by Chris Cormack 02 May '01

02 May '01

Update of /cvsroot/koha/koha In directory usw-pr-cvs1:/tmp/cvs-serv7454 Added Files: maninvoice.pl mancredit.pl Log Message: Scripts to add manual invoices, or credits to a borrower/member/patron's account. Called from boraccount.pl (ie the view account screen) --- NEW FILE --- #!/usr/bin/perl #wrriten 11/1/2000 by chris(a)katipo.oc.nz #script to display borrowers account details use strict; use C4::Output; use CGI; use C4::Search; use C4::Accounts2; my $input=new CGI; my $bornum=$input->param('bornum'); #get borrower details my $data=borrdata('',$bornum); my $add=$input->param('add'); if ($add){ my $itemnum=$input->param('itemnum'); 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/moremember.pl?bornum=$bornum"); } else { print $input->header; print startpage(); print startmenu('member'); print <<printend <Center><h3>Manual Invoice</h3></center> <form action=/cgi-bin/koha/maninvoice.pl method=post> <table cellpadding=2 cellspacing=0 border=0> <input type=hidden name=bornum value=$bornum> <tr><td><b>Borrowernumber<b></td><td>$bornum</td></tr>  <tr><td><b>Type</b></td><Td> <select name=type> <option value=L>Lost Item</option> <option value=F>Fine</option> <option value=A>Account Management Fee</option> <option value=N>New Card</option> <option value=M>Sundry</option> </select> </td></tr> <tr><td><b>Itemnumber</b></td><td><input type=text name=itemnum></td></tr> <tr><td><b>Description</b></td><td><input type=text name=desc size=50></td></tr> <tr><td><b>Amount</b></td><td><input type=text name=amount></td></tr> <tr><td><input type=submit name=add value=Add></td></tr> </table> </form> printend ; print endmenu('member'); print endpage(); } --- NEW FILE --- #!/usr/bin/perl #wrriten 11/1/2000 by chris(a)katipo.oc.nz #script to display borrowers account details use strict; use C4::Output; use CGI; use C4::Search; use C4::Accounts2; my $input=new CGI; my $bornum=$input->param('bornum'); #get borrower details my $data=borrdata('',$bornum); my $add=$input->param('add'); if ($add){ my $itemnum=$input->param('itemnum'); my $desc=$input->param('desc'); my $amount=$input->param('amount'); $amount=$amount*-1; my $type=$input->param('type'); manualinvoice($bornum,$itemnum,$desc,$type,$amount); print $input->redirect("/cgi-bin/koha/moremember.pl?bornum=$bornum"); } else { print $input->header; print startpage(); print startmenu('member'); print <<printend <Center><h3>Manual Credit</h3></center> <form action=/cgi-bin/koha/mancredit.pl method=post> <table cellpadding=2 cellspacing=0 border=0> <input type=hidden name=bornum value=$bornum> <tr><td><b>Borrowernumber<b></td><td>$bornum</td></tr>  <tr><td><b>Type</b></td><Td> <select name=type> <option value=C>Credit</option> <option value=BAY>Baycorp Adjustment</option> </select> </td></tr> <tr><td><b>Itemnumber</b></td><td><input type=text name=itemnum></td></tr> <tr><td><b>Description</b></td><td><input type=text name=desc size=50></td></tr> <tr><td><b>Amount</b></td><td><input type=text name=amount></td></tr> <tr><td><input type=submit name=add value=Add></td></tr> </table> </form> printend ; print endmenu('member'); print endpage(); }

1 0

CVS: koha/C4 Accounts2.pm,1.4,1.5
by Chris Cormack 02 May '01

02 May '01

Update of /cvsroot/koha/koha/C4 In directory usw-pr-cvs1:/tmp/cvs-serv9702/C4 Modified Files: Accounts2.pm Log Message: Fixed a bug in the return lost routine (when a payment is made on a lost item) So that the correct date was being recorded Index: Accounts2.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Accounts2.pm,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** Accounts2.pm 2001/04/18 02:51:18 1.4 --- Accounts2.pm 2001/05/01 23:24:50 1.5 *************** *** 197,201 **** $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'"; --- 197,202 ---- $sth->execute; $sth->finish; ! my @datearr = localtime($time); ! my $date = (1900+$datearr[5])."-".($datearr[4]+1)."-".$datearr[3]; my $bor="$borrower->{'firstname'} $borrower->{'surname'} $borrower->{'cardnumber'}"; my $upitem="Update items set itemnotes='Paid for by $bor $date' where itemnumber='$itemnum'";

1 0