X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=circ%2Fcirculation.pl;h=b4a0cebb86f80a2bab1c4656e301ca26fe321ddf;hb=100e6a9808ead4ee8d951da59ead1550e75bb4c3;hp=e284307ba9f0cd260ef2c5559062f49b60a9c88a;hpb=a72d9621ae5ffe8fdca6179aa64ee403c43fce4b;p=koha.git

diff --git a/circ/circulation.pl b/circ/circulation.pl
index e284307ba9..b4a0cebb86 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -1,9 +1,9 @@
 #!/usr/bin/perl
-# Please use 8-character tabs for this file (indents are every 4 characters)
 
-#written 8/5/2002 by Finlay
-#script to execute issuing of books
+# Please use 8-character tabs for this file (indents are every 4 characters)
 
+# written 8/5/2002 by Finlay
+# script to execute issuing of books
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -24,447 +24,707 @@
 
 use strict;
 use CGI;
-use C4::Circulation::Circ2;
-use C4::Search;
 use C4::Output;
 use C4::Print;
-use DBI;
 use C4::Auth;
-use C4::Interface::CGI::Output;
-use C4::Koha;
-use HTML::Template;
 use C4::Date;
+use C4::Branch; # GetBranches
+use C4::Koha;   # GetPrinter
+use C4::Circulation;
+use C4::Members;
+use C4::Biblio;
+use C4::Reserves;
+
+use Date::Calc qw(
+  Today
+  Today_and_Now
+  Add_Delta_YM
+  Add_Delta_Days
+  Date_to_Days
+);
 
-my $query=new CGI;
-#my ($loggedinuser, $sessioncookie, $sessionID) = checkauth
-#	($query, 0, { circulate => 1 });
 
-my ($template, $loggedinuser, $cookie) = get_template_and_user
-    ({
-	template_name	=> 'circ/circulation.tmpl',
-	query		=> $query,
-	type		=> "intranet",
-	authnotrequired	=> 0,
-	flagsrequired	=> { circulate => 1 },
-    });
+#
+# PARAMETERS READING
+#
+my $query = new CGI;
+
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user (
+    {
+        template_name   => 'circ/circulation.tmpl',
+        query           => $query,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { circulate => 1 },
+    }
+);
+my $branches = GetBranches();
 
+my $printers = GetPrinters();
+my $printer = GetPrinter($query, $printers);
 
-my %env;
-my $linecolor1='#ffffcc';
-my $linecolor2='white';
+my $findborrower = $query->param('findborrower');
+$findborrower =~ s|,| |g;
+#$findborrower =~ s|'| |g;
+my $borrowernumber = $query->param('borrowernumber');
+
+# 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'};
+
+# If Autolocated is not activated, we show the Circulation Parameters to chage settings of librarian
+    if (C4::Context->preference("AutoLocation") ne 1)
+        {
+            $template->param(
+            ManualLocation => 1,
+            );
+        }
+
+my $barcode        = $query->param('barcode') || '';
+my $year           = $query->param('year');
+my $month          = $query->param('month');
+my $day            = $query->param('day');
+my $stickyduedate  = $query->param('stickyduedate');
+my $issueconfirmed = $query->param('issueconfirmed');
+my $cancelreserve  = $query->param('cancelreserve');
+my $organisation   = $query->param('organisations');
+my $print          = $query->param('print');
 
-my $branches = getbranches();
-my $printers = getprinters(\%env);
+#set up cookie.....
+# my $branchcookie;
+# my $printercookie;
+# if ($query->param('setcookies')) {
+#     $branchcookie = $query->cookie(-name=>'branch', -value=>"$branch", -expires=>'+1y');
+#     $printercookie = $query->cookie(-name=>'printer', -value=>"$printer", -expires=>'+1y');
+# }
+#
 
-my $branch = getbranch($query, $branches);
-my $printer = getprinter($query, $printers);
 
+my @datearr = localtime( time() );
 
-#set up cookie.....
-my $branchcookie;
-my $printercookie;
-if ($query->param('setcookies')) {
-	$branchcookie = $query->cookie(-name=>'branch', -value=>"$branch", -expires=>'+1y');
-	$printercookie = $query->cookie(-name=>'printer', -value=>"$printer", -expires=>'+1y');
+# FIXME - Could just use POSIX::strftime("%Y%m%d", localtime);
+my $todaysdate =
+    ( 1900 + $datearr[5] )
+  . sprintf( "%0.2d", ( $datearr[4] + 1 ) )
+  . sprintf( "%0.2d", ( $datearr[3] ) );
+
+# check and see if we should print
+if ( $barcode eq '' && $print eq 'maybe' ) {
+    $print = 'yes';
 }
 
-$env{'branchcode'}=$branch;
-$env{'printer'}=$printer;
-$env{'queue'}=$printer;
+my $inprocess = $query->param('inprocess');
+if ( $barcode eq '' ) {
+    $inprocess = '';
+}
+else {
+}
 
-my @datearr = localtime(time());
-# FIXME - Could just use POSIX::strftime("%Y%m%d", localtime);
-my $todaysdate = (1900+$datearr[5]).sprintf ("%0.2d", ($datearr[4]+1)).sprintf ("%0.2d", ($datearr[3]));
-#warn $todaysdate;
+if ( $barcode eq '' && $query->param('charges') eq 'yes' ) {
+    $template->param(
+        PAYCHARGES     => 'yes',
+        borrowernumber => $borrowernumber
+    );
+}
 
+if ( $print eq 'yes' && $borrowernumber ne '' ) {
+    printslip( $borrowernumber );
+    $query->param( 'borrowernumber', '' );
+    $borrowernumber = '';
+}
 
-my $message;
-my $borrowerslist;
+#
+# STEP 2 : FIND BORROWER
 # if there is a list of find borrowers....
-my $findborrower = $query->param('findborrower');
+#
+my $borrowerslist;
+my $message;
 if ($findborrower) {
-	my ($count,$borrowers)=BornameSearch(\%env,$findborrower,'web');
-	my @borrowers=@$borrowers;
-	if ($#borrowers == -1) {
-		$query->param('findborrower', '');
-		$message =  "No borrower matched '$findborrower'";
-	} elsif ($#borrowers == 0) {
-		$query->param('borrnumber', $borrowers[0]->{'borrowernumber'});
-		$query->param('barcode','');
-	} else {
-		$borrowerslist = \@borrowers;
-	}
-}
-
-my $borrowernumber = $query->param('borrnumber');
-my $bornum = $query->param('borrnumber');
-# check and see if we should print
-my $print=$query->param('print');
-my $barcode = $query->param('barcode');
-if ($barcode eq ''  && $print eq 'maybe'){
-	$print = 'yes';
-}
-if ($print eq 'yes' && $borrowernumber ne ''){
-	printslip(\%env,$borrowernumber);
-	$query->param('borrnumber','');
-	$borrowernumber='';
+    my ( $count, $borrowers ) =
+      SearchBorrower($findborrower, 'cardnumber', 'web' );
+    my @borrowers = @$borrowers;
+    if ( $#borrowers == -1 ) {
+        $query->param( 'findborrower', '' );
+        $message = "'$findborrower'";
+    }
+    elsif ( $#borrowers == 0 ) {
+        $query->param( 'borrowernumber', $borrowers[0]->{'borrowernumber'} );
+        $query->param( 'barcode',           '' );
+        $borrowernumber = $borrowers[0]->{'borrowernumber'};
+    }
+    else {
+        $borrowerslist = \@borrowers;
+    }
 }
 
 # get the borrower information.....
 my $borrower;
-my $flags;
-if ($borrowernumber) {
-    ($borrower, $flags) = getpatroninformation(\%env,$borrowernumber,0);
-}
+my @lines;
 
-# get the responses to any questions.....
-my %responses;
-foreach (sort $query->param) {
-	if ($_ =~ /response-(\d*)/) {
-		$responses{$1} = $query->param($_);
-	}
-}
-if (my $qnumber = $query->param('questionnumber')) {
-	$responses{$qnumber} = $query->param('answer');
+if ($borrowernumber) {
+    $borrower = GetMemberDetails( $borrowernumber, 0 );
+    my ( $od, $issue, $fines ) = GetBorrowerIssuesAndFines( $borrowernumber );
+
+    # Warningdate is the date that the warning starts appearing
+    my ( $today_year,   $today_month,   $today_day )   = Today();
+    my ( $warning_year, $warning_month, $warning_day ) = split /-/,
+      $borrower->{'dateexpiry'};
+
+    # Renew day is calculated by adding the enrolment period to today
+    my ( $renew_year, $renew_month, $renew_day ) =
+      Add_Delta_YM( $today_year, $today_month, $today_day,
+        $borrower->{'enrolmentperiod'}, 0 );
+    # if the expiry date is before today
+    if ( Date_to_Days( $today_year, $today_month, $today_day ) >
+        Date_to_Days( $warning_year, $warning_month, $warning_day ) )
+    {
+
+        #borrowercard expired or nearly expired, warn the librarian
+        $template->param(
+            flagged       => "1",
+            warndeparture => "1",
+            renewaldate   => "$renew_year-$renew_month-$renew_day"
+        );
+    }
+    # check for NotifyBorrowerDeparture
+        if (C4::Context->preference('NotifyBorrowerDeparture') &&
+            Date_to_Days(Add_Delta_Days($warning_year,$warning_month,$warning_day,- C4::Context->preference('NotifyBorrowerDeparture'))) <
+            Date_to_Days( $today_year, $today_month, $today_day ) ) 
+        {
+            $template->param("warndeparture" => 1);
+        }
+    $template->param(
+        overduecount => $od,
+        issuecount   => $issue,
+        finetotal    => $fines
+    );
 }
 
-my ($iteminformation, $duedate, $rejected, $question, $questionnumber, $defaultanswer);
-
-my $year=$query->param('year');
-my $month=$query->param('month');
-my $day=$query->param('day');
+#
+# STEP 3 : ISSUING
+#
+#
 
-# if the barcode is set
 if ($barcode) {
-	$barcode = cuecatbarcodedecode($barcode);
-	my ($datedue, $invalidduedate) = fixdate($year, $month, $day);
-
-	unless ($invalidduedate) {
-		$env{'datedue'}=$datedue;
-		my @time=localtime(time);
-		my $date= (1900+$time[5])."-".($time[4]+1)."-".$time[3];
-		($iteminformation, $duedate, $rejected, $question, $questionnumber, $defaultanswer, $message)
-					= issuebook(\%env, $borrower, $barcode, \%responses, $date);
-	}
+    $barcode = cuecatbarcodedecode($barcode);
+    my ( $datedue, $invalidduedate ) = fixdate( $year, $month, $day );
+    if ($issueconfirmed) {
+        AddIssue( $borrower, $barcode, $datedue, $cancelreserve );
+        $inprocess = 1;
+    }
+    else {
+        my ( $error, $question ) =
+          CanBookBeIssued( $borrower, $barcode, $year, $month, $day,
+            $inprocess );
+        my $noerror    = 1;
+        my $noquestion = 1;
+#         Get the item title for more information
+    my $getmessageiteminfo  = GetBiblioFromItemNumber( undef, $barcode );
+    
+        foreach my $impossible ( keys %$error ) {
+            $template->param(
+                $impossible => $$error{$impossible},
+                IMPOSSIBLE  => 1
+            );
+            $noerror = 0;
+        }
+        foreach my $needsconfirmation ( keys %$question ) {
+            $template->param(
+                $needsconfirmation => $$question{$needsconfirmation},
+                getTitleMessageIteminfo => $getmessageiteminfo->{'title'},
+                NEEDSCONFIRMATION  => 1
+            );
+            $noquestion = 0;
+        }
+        $template->param(
+            day   => $day,
+            month => $month,
+            year  => $year
+        );
+        if ( $noerror && ( $noquestion || $issueconfirmed ) ) {
+            AddIssue( $borrower, $barcode, $datedue );
+            $inprocess = 1;
+        }
+    }
+    
+# FIXME If the issue is confirmed, we launch another time borrdata2, now display the issue count after issue 
+        my ( $od, $issue, $fines ) = GetBorrowerIssuesAndFines( $borrowernumber );
+        $template->param(
+        issuecount   => $issue,
+        );
 }
 
 # reload the borrower info for the sake of reseting the flags.....
 if ($borrowernumber) {
-	($borrower, $flags) = getpatroninformation(\%env,$borrowernumber,0);
+    $borrower = GetMemberDetails( $borrowernumber, 0 );
 }
 
 ##################################################################################
-# HTML code....
-
-my $responsesform = '';
-foreach (keys %responses) {
-    $responsesform.="<input type=hidden name=response-$_ value=$responses{$_}>\n";
-}
-my $questionform;
-my $stickyduedate;
-if ($question) {
-    $stickyduedate=$query->param('stickyduedate');
-}
-
+# BUILD HTML
+# show all reserves of this borrower, and the position of the reservation ....
+if ($borrowernumber) {
 
-# Barcode entry box, with hidden inputs attached....
-my $counter = 1;
-my $dayoptions = '';
-my $monthoptions = '';
-my $yearoptions = '';
-for (my $i=1; $i<32; $i++) {
-    my $selected='';
-    if (($query->param('stickyduedate')) && ($day==$i)) {
-	$selected='selected';
-    }
-    $dayoptions.="<option value=$i $selected>$i";
-}
-foreach (('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec')) {
-    my $selected='';
-    if (($query->param('stickyduedate')) && ($month==$counter)) {
-	$selected='selected';
-    }
-    $monthoptions.="<option value=$counter $selected>$_";
-    $counter++;
-}
-for (my $i=$datearr[5]+1900; $i<$datearr[5]+1905; $i++) {
-    my $selected='';
-    if (($query->param('stickyduedate')) && ($year==$i)) {
-	$selected='selected';
+    # new op dev
+    # now we show the status of the borrower's reservations
+    my @borrowerreserv = GetReservations( 0, $borrowernumber );
+    my @reservloop;
+    my @WaitingReserveLoop;
+    
+    foreach my $num_res (@borrowerreserv) {
+        my %getreserv;
+        my %getWaitingReserveInfo;
+        my $getiteminfo  = GetBiblioFromItemNumber( $num_res->{'itemnumber'} );
+        my $itemtypeinfo = getitemtypeinfo( $getiteminfo->{'itemtype'} );
+        my ( $transfertwhen, $transfertfrom, $transfertto ) =
+          GetTransfers( $num_res->{'itemnumber'} );
+
+        $getreserv{waiting}       = 0;
+        $getreserv{transfered}    = 0;
+        $getreserv{nottransfered} = 0;
+
+        $getreserv{reservedate}    = format_date( $num_res->{'reservedate'} );
+        $getreserv{biblionumber}   = $getiteminfo->{'biblionumber'};
+        $getreserv{title}          = $getiteminfo->{'title'};
+        $getreserv{itemtype}       = $itemtypeinfo->{'description'};
+        $getreserv{author}         = $getiteminfo->{'author'};
+        $getreserv{barcodereserv}  = $getiteminfo->{'barcode'};
+        $getreserv{itemcallnumber} = $getiteminfo->{'itemcallnumber'};
+
+        #         check if we have a waiting status for reservations
+        if ( $num_res->{'found'} eq 'W' ) {
+            $getreserv{color}   = 'reserved';
+            $getreserv{waiting} = 1;
+#     genarate information displaying only waiting reserves
+        $getWaitingReserveInfo{title}        = $getiteminfo->{'title'};
+        $getWaitingReserveInfo{itemtype}    = $itemtypeinfo->{'description'};
+        $getWaitingReserveInfo{author}        = $getiteminfo->{'author'};
+        $getWaitingReserveInfo{reservedate}    = format_date( $num_res->{'reservedate'} );
+        if ($getiteminfo->{'holdingbranch'} ne $num_res->{'branchcode'} ) {
+        $getWaitingReserveInfo{waitingat}    = GetBranchName( $num_res->{'branchcode'} );
+        }
+    
+        }
+        #         check transfers with the itemnumber foud in th reservation loop
+        if ($transfertwhen) {
+            $getreserv{color}      = 'transfered';
+            $getreserv{transfered} = 1;
+            $getreserv{datesent}   = format_date($transfertwhen);
+            $getreserv{frombranch} = GetBranchName($transfertfrom);
+        }
+
+        if ( ( $getiteminfo->{'holdingbranch'} ne $num_res->{'branchcode'} )
+            and not $transfertwhen )
+        {
+            $getreserv{nottransfered}   = 1;
+            $getreserv{nottransferedby} =
+              GetBranchName( $getiteminfo->{'holdingbranch'} );
+        }
+
+#         if we don't have a reserv on item, we put the biblio infos and the waiting position
+        if ( $getiteminfo->{'title'} eq '' ) {
+            my $getbibinfo = GetBiblioItemData( $num_res->{'biblionumber'} );
+            my $getbibtype = getitemtypeinfo( $getbibinfo->{'itemtype'} );
+            $getreserv{color}           = 'inwait';
+            $getreserv{title}           = $getbibinfo->{'title'};
+            $getreserv{waitingposition} = $num_res->{'priority'};
+            $getreserv{nottransfered}   = 0;
+            $getreserv{itemtype}        = $getbibtype->{'description'};
+            $getreserv{author}          = $getbibinfo->{'author'};
+            $getreserv{itemcallnumber}  = '----------';
+
+        }
+        push( @reservloop, \%getreserv );
+
+#         if we have a reserve waiting, initiate waitingreserveloop
+        if ($getreserv{waiting} eq 1) {
+        push (@WaitingReserveLoop, \%getWaitingReserveInfo)
+        }
+      
     }
-    $yearoptions.="<option value=$i $selected>$i";
-}
-my $selected='';
-($query->param('stickyduedate')) && ($selected='checked');
 
+    # return result to the template
+    $template->param( 
+        countreserv => scalar @reservloop,
+        reservloop  => \@reservloop ,
+        WaitingReserveLoop  => \@WaitingReserveLoop,
+    );
+}
 
-# make the issued books table.....
-my $todaysissues='';
-my $previssues='';
+# make the issued books table.
+my $todaysissues = '';
+my $previssues   = '';
 my @realtodayissues;
 my @realprevissues;
+my $allowborrow;
+## ADDED BY JF: new itemtype issuingrules counter stuff
+my $issued_itemtypes_loop;
+my $issued_itemtypes_count;
+my $issued_itemtypes_allowed_count;    # hashref with total allowed by itemtype
+my $issued_itemtypes_remaining;        # hashref with remaining
+my $issued_itemtypes_flags;            #hashref that stores flags
+
 if ($borrower) {
+
+# get each issue of the borrower & separate them in todayissues & previous issues
     my @todaysissues;
     my @previousissues;
-    my $issueslist = getissues($borrower);
-    foreach my $it (keys %$issueslist) {
-	my $issuedate = $issueslist->{$it}->{'timestamp'};
-	$issuedate = substr($issuedate, 0, 8);
-	if ($todaysdate == $issuedate) {
-	    push @todaysissues, $issueslist->{$it};
-	} else {
-	    push @previousissues, $issueslist->{$it};
-	}
+    my $issueslist = GetBorrowerIssues($borrower);
+
+    # split in 2 arrays for today & previous
+    my $dbh = C4::Context->dbh;
+    foreach my $it ( @$issueslist ) {
+        my $issuedate = $it->{'timestamp'};
+        $issuedate =~ s/-//g;
+        $issuedate = substr( $issuedate, 0, 8 );
+
+        # to let perl sort this correctly
+        $it->{'timestamp'} =~ s/(-|\:| )//g;
+
+        if ( $todaysdate == $issuedate ) {
+            (
+                $it->{'charge'},
+                $it->{'itemtype_charge'}
+              )
+              = GetIssuingCharges(
+                $it->{'itemnumber'},
+                $borrower->{'borrowernumber'}
+              );
+            $it->{'charge'} =
+              sprintf( "%.2f", $it->{'charge'} );
+            (
+                $it->{'can_renew'},
+                $it->{'can_renew_error'}
+              )
+              = CanBookBeRenewed(
+                $borrower->{'borrowernumber'},
+                $it->{'itemnumber'}
+              );
+            my ( $restype, $reserves ) =
+              CheckReserves( $it->{'itemnumber'} );
+            if ($restype) {
+                $it->{'can_renew'} = 0;
+            }
+            push @todaysissues, $it;
+        }
+        else {
+            (
+                $it->{'charge'},
+                $it->{'itemtype_charge'}
+              )
+              = GetIssuingCharges(
+                $it->{'itemnumber'},
+                $borrower->{'borrowernumber'}
+              );
+            $it->{'charge'} =
+              sprintf( "%.2f", $it->{'charge'} );
+            (
+                $it->{'can_renew'},
+                $it->{'can_renew_error'}
+              )
+              = CanBookBeRenewed(
+                $borrower->{'borrowernumber'},
+                $it->{'itemnumber'}
+              );
+            my ( $restype, $reserves ) =
+              CheckReserves( $it->{'itemnumber'} );
+            if ($restype) {
+                $it->{'can_renew'} = 0;
+            }
+            push @previousissues, $it;
+        }
     }
-    my $tcolor = '';
-    my $pcolor = '';
-    foreach my $book (sort {$b->{'timestamp'} <=> $a->{'timestamp'}} @todaysissues){
-	my $dd = $book->{'date_due'};
-	my $datedue = $book->{'date_due'};
-	$dd=format_date($dd);
-	$datedue=~s/-//g;
-	if ($datedue < $todaysdate) {
-	    $dd="<font color=red>$dd</font>\n";
-	}
-	($tcolor eq $linecolor1) ? ($tcolor=$linecolor2) : ($tcolor=$linecolor1);
-	$book->{'dd'}=$dd;
-	$book->{'tcolor'}=$tcolor;
-	push @realtodayissues,$book
+    my $od;    # overdues
+    my $i = 0;
+    my $togglecolor;
+
+    # parses today & build Template array
+    foreach my $book ( sort { $b->{'timestamp'} <=> $a->{'timestamp'} }
+        @todaysissues )
+    {
+        #warn "TIMESTAMP".$book->{'timestamp'};
+        # ADDED BY JF: NEW ITEMTYPE COUNT DISPLAY
+        $issued_itemtypes_count->{ $book->{'itemtype'} }++;
+
+        my $dd      = $book->{'date_due'};
+        my $datedue = $book->{'date_due'};
+
+        #$dd=format_date($dd);
+        $datedue =~ s/-//g;
+        if ( $datedue < $todaysdate ) {
+            $od = 1;
+        }
+        else {
+            $od = 0;
+        }
+        if ( $i % 2 ) {
+            $togglecolor = 0;
+        }
+        else {
+            $togglecolor = 1;
+        }
+        $book->{'togglecolor'} = $togglecolor;
+        $book->{'od'}          = format_date($od);
+        $book->{'dd'}          = format_date($dd);
+        if ( $book->{'author'} eq '' ) {
+            $book->{'author'} = ' ';
+        }
+        push @realtodayissues, $book;
+        $i++;
     }
-    # FIXME - For small and private libraries, it'd be nice if this
-    # table included a "Return" link next to each book, so that you
-    # don't have to remember the book's bar code and type it in on the
-    # "Returns" page.
-    
-    # This is in the template now, so its possible for a small library to make that link in their
-    # template
-    
-    foreach my $book (sort {$a->{'date_due'} cmp $b->{'date_due'}} @previousissues){
-	my $dd = $book->{'date_due'};
-	my $datedue = $book->{'date_due'};
-	$dd=format_date($dd);
-	$datedue=~s/-//g;
-	if ($datedue < $todaysdate) {
-	    $dd="<font color=red>$dd</font>\n";
-	}
-	($pcolor eq $linecolor1) ? ($pcolor=$linecolor2) : ($pcolor=$linecolor1);
-	$book->{'dd'}=$dd;
-	$book->{'tcolor'}=$pcolor;
-	push @realprevissues,$book
+
+    # parses previous & build Template array
+    $i = 0;
+    foreach my $book ( sort { $a->{'date_due'} cmp $b->{'date_due'} }
+        @previousissues )
+    {
+
+        # ADDED BY JF: NEW ITEMTYPE COUNT DISPLAY
+        $issued_itemtypes_count->{ $book->{'itemtype'} }++;
+
+        my $dd      = format_date($book->{'date_due'});
+        my $datedue = format_date($book->{'date_due'});
+
+        #$dd=format_date($dd);
+        my $pcolor = '';
+        my $od     = '';
+        $datedue =~ s/-//g;
+        if ( $datedue < $todaysdate ) {
+            $od = 1;
+        }
+        else {
+            $od = 0;
+        }
+        if ( $i % 2 ) {
+            $togglecolor = 0;
+        }
+        else {
+            $togglecolor = 1;
+        }
+        $book->{'togglecolor'} = $togglecolor;
+        $book->{'dd'}          = $dd;
+        $book->{'od'}          = $od;
+        if ( $book->{'author'} eq '' ) {
+            $book->{'author'} = ' ';
+        }
+        push @realprevissues, $book;
+        $i++;
     }
 }
 
-# actually print the page!
-#if ($branchcookie && $printercookie) {
-#    print $query->header(-type=>'text/html',-expires=>'now', -cookie=>[$branchcookie,$printercookie,$sessioncookie]);
-#} else {
-#    print $query->header(-cookie=>[$sessioncookie]);
-#}
+#### ADDED BY JF FOR COUNTS BY ITEMTYPE RULES
+# FIXME: This should utilize all the issuingrules options rather than just the defaults
+# and it should be moved to a module
+my $dbh = C4::Context->dbh;
+
+# how many of each is allowed?
+my $issueqty_sth = $dbh->prepare( "
+SELECT itemtypes.description AS description,issuingrules.itemtype,maxissueqty
+FROM issuingrules
+  LEFT JOIN itemtypes ON (itemtypes.itemtype=issuingrules.itemtype)
+  WHERE categorycode=?
+" );
+my @issued_itemtypes_count;
+$issueqty_sth->execute("*");
+while ( my $data = $issueqty_sth->fetchrow_hashref() ) {
+
+    # subtract how many of each this borrower has
+    $data->{'count'} = $issued_itemtypes_count->{ $data->{'description'} };
+    $data->{'left'}  =
+      ( $data->{'maxissueqty'} -
+          $issued_itemtypes_count->{ $data->{'description'} } );
+
+    # can't have a negative number of remaining
+    if ( $data->{'left'} < 0 ) { $data->{'left'} = "0" }
+    $data->{'flag'} = 1 unless ( $data->{'maxissueqty'} > $data->{'count'} );
+    unless ( ( $data->{'maxissueqty'} < 1 )
+        || ( $data->{'itemtype'} eq "*" )
+        || ( $data->{'itemtype'} eq "CIRC" ) )
+    {
+        push @issued_itemtypes_count, $data;
+    }
+}
+$issued_itemtypes_loop = \@issued_itemtypes_count;
 
-#if ($query->param('barcode') eq '' && $query->param('charges') eq 'yes'){
-#    my $count=@inp;
-#     for (my $i=0;$i<$count;$i++){
-#	 $inp[$i]=~ s/onLoad=focusinput\(\)/onLoad=focusinput\(\)\;messenger\(\"\/cgi-bin\/koha\/pay.pl?bornum=$bornum\",700,600\)\;window1.focus\(\)/;
-#     }
-#}
+#### / JF
 
 my @values;
 my %labels;
 my $CGIselectborrower;
 if ($borrowerslist) {
-	foreach (sort {$a->{'surname'}.$a->{'firstname'} cmp $b->{'surname'}.$b->{'firstname'}} @$borrowerslist){
-		push @values,$_->{'borrowernumber'};
-		$labels{$_->{'borrowernumber'}} ="$_->{'surname'}, $_->{'firstname'} ($_->{'cardnumber'})";
-	}
-	$CGIselectborrower=CGI::scrolling_list( -name     => 'borrnumber',
-				-values   => \@values,
-				-labels   => \%labels,
-				-size     => 7,
-				-multiple => 0 );
-}
-#title
-
-my ($patrontable, $flaginfotable) = patrontable($borrower);
-my $amountold=$flags->{'CHARGES'}->{'message'};
-my @temp=split(/\$/,$amountold);
-$amountold=$temp[1];
-$template->param(
-		findborrower => $findborrower,
-		borrower => $borrower,
-		borrowernumber => $borrowernumber,
-		branch => $branch,
-		printer => $printer,
-		branchname => $branches->{$branch}->{'branchname'},
-		printername => $printers->{$printer}->{'printername'},
-
-		#question form
-		question => $question,
-		title => $iteminformation->{'title'},
-		author => $iteminformation->{'author'},
-		firstname => $borrower->{'firstname'},
-		surname => $borrower->{'surname'},
-		question => $question,
-		barcode => $barcode,
-		questionnumber => $questionnumber,
-		dayoptions => $dayoptions,
-		monthoptions => $monthoptions,
-		yearoptions => $yearoptions,
-		stickyduedate => $stickyduedate,
-		responseform => $responsesform,
-		rejected => $rejected,
-		message => $message,
-		CGIselectborrower => $CGIselectborrower,
-
-		patrontable => $patrontable,
-		flaginfotable => $flaginfotable,
-		CHARGES => $flags->{'CHARGES'},
-		amountold => $amountold,
-		todayissues => \@realtodayissues,
-		previssues => \@realprevissues,
-	);
-
-if ($branchcookie) {
-    $cookie=[$cookie, $branchcookie, $printercookie];
-}
-
-output_html_with_http_headers $query, $cookie, $template->output;
-
-####################################################################
-# Extra subroutines,,,
-
-sub cuecatbarcodedecode {
-    my ($barcode) = @_;
-    chomp($barcode);
-    my @fields = split(/\./,$barcode);
-    my @results = map(decode($_), @fields[1..$#fields]);
-    if ($#results == 2){
-  	return $results[2];
-    } else {
-	return $barcode;
+    foreach (
+        sort {
+                $a->{'surname'}
+              . $a->{'firstname'} cmp $b->{'surname'}
+              . $b->{'firstname'}
+        } @$borrowerslist
+      )
+    {
+        push @values, $_->{'borrowernumber'};
+        $labels{ $_->{'borrowernumber'} } =
+"$_->{'surname'}, $_->{'firstname'} ... ($_->{'cardnumber'} - $_->{'categorycode'}) ...  $_->{'address'} ";
     }
+    $CGIselectborrower = CGI::scrolling_list(
+        -name     => 'borrowernumber',
+        -values   => \@values,
+        -labels   => \%labels,
+        -size     => 7,
+        -tabindex => '',
+        -multiple => 0
+    );
 }
 
-sub fixdate {
-    my ($year, $month, $day) = @_;
-    my $invalidduedate;
-    my $date;
-    if (($year eq 0) && ($month eq 0) && ($year eq 0)) {
-	$env{'datedue'}='';
-    } else {
-	if (($year eq 0) || ($month eq 0) || ($year eq 0)) {
-	    $invalidduedate="Invalid Due Date Specified. Book was not issued.<p>\n";
-	} else {
-	    if (($day>30) && (($month==4) || ($month==6) || ($month==9) || ($month==11))) {
-		$invalidduedate = "Invalid Due Date Specified. Book was not issued. Only 30 days in $month month.<p>\n";
-	    } elsif (($day > 29) && ($month == 2)) {
-		$invalidduedate="Invalid Due Date Specified. Book was not issued.  Never that many days in February!<p>\n";
-	    } elsif (($month == 2) && ($day > 28) && (($year%4) && ((!($year%100) || ($year%400))))) {
-		$invalidduedate="Invalid Due Date Specified. Book was not issued.  $year is not a leap year.<p>\n";
-	    } else {
-		$date=format_date("$year-$month-$day");
-	    }
-	}
+#title
+my $flags = $borrower->{'flags'};
+my $flag;
+
+foreach $flag ( sort keys %$flags ) {
+
+    $flags->{$flag}->{'message'} =~ s/\n/<br>/g;
+    if ( $flags->{$flag}->{'noissues'} ) {
+        $template->param(
+            flagged  => 1,
+            noissues => 'true',
+        );
+        if ( $flag eq 'GNA' ) {
+            $template->param( gna => 'true' );
+        }
+        if ( $flag eq 'LOST' ) {
+            $template->param( lost => 'true' );
+        }
+        if ( $flag eq 'DBARRED' ) {
+            $template->param( dbarred => 'true' );
+        }
+        if ( $flag eq 'CHARGES' ) {
+            $template->param(
+                charges    => 'true',
+                chargesmsg => $flags->{'CHARGES'}->{'message'}
+            );
+        }
+        if ( $flag eq 'CREDITS' ) {
+            $template->param(
+                credits    => 'true',
+                creditsmsg => $flags->{'CREDITS'}->{'message'}
+            );
+        }
+    }
+    else {
+        if ( $flag eq 'CHARGES' ) {
+            $template->param(
+                charges    => 'true',
+                flagged    => 1,
+                chargesmsg => $flags->{'CHARGES'}->{'message'}
+            );
+        }
+        if ( $flag eq 'CREDITS' ) {
+            $template->param(
+                credits    => 'true',
+                creditsmsg => $flags->{'CREDITS'}->{'message'}
+            );
+        }
+        if ( $flag eq 'ODUES' ) {
+            $template->param(
+                odues    => 'true',
+                flagged  => 1,
+                oduesmsg => $flags->{'ODUES'}->{'message'}
+            );
+
+            my $items = $flags->{$flag}->{'itemlist'};
+# useless ???
+#             {
+#                 my @itemswaiting;
+#                 foreach my $item (@$items) {
+#                     my ($iteminformation) =
+#                         getiteminformation( $item->{'itemnumber'}, 0 );
+#                     push @itemswaiting, $iteminformation;
+#                 }
+#             }
+            if ( $query->param('module') ne 'returns' ) {
+                $template->param( nonreturns => 'true' );
+            }
+        }
+        if ( $flag eq 'NOTES' ) {
+            $template->param(
+                notes    => 'true',
+                flagged  => 1,
+                notesmsg => $flags->{'NOTES'}->{'message'}
+            );
+        }
     }
-    return ($date, $invalidduedate);
 }
 
-
-sub patrontable {
-    my ($borrower) = @_;
-    my $flags = $borrower->{'flags'};
-    my $flaginfotable='';
-    my $flaginfotext='';
-    my $flag;
-    my $color='';
-    foreach $flag (sort keys %$flags) {
-	($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
-	$flags->{$flag}->{'message'}=~s/\n/<br>/g;
-	if ($flags->{$flag}->{'noissues'}) {
-	    if ($flag eq 'CHARGES') {
-		$flaginfotext.="<tr><td valign=top><font color=red>$flag</font></td><td bgcolor=$color><b>$flags->{$flag}->{'message'}</b> <a href=/cgi-bin/koha/pay.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this, 'Payment', 480,640)\">Payment</a></td></tr>\n";
-	    } else {
-		$flaginfotext.="<tr><td valign=top><font color=red>$flag</font></td><td bgcolor=$color>$flags->{$flag}->{'message'}</td></tr>\n";
-	    }
-	} 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='';
-		my $items=$flags->{$flag}->{'itemlist'};
-		foreach my $item (@$items) {
-		    my ($iteminformation) = getiteminformation(\%env, $item->{'itemnumber'}, 0);
-		    $itemswaiting.="<a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$iteminformation->{'barcode'}</a> $iteminformation->{'title'} ($branches->{$iteminformation->{'holdingbranch'}}->{'branchname'})<br>\n";
-		}
-		$flaginfotext.="<tr><td valign=top>$flag</td><td>$itemswaiting</td></tr>\n";
-	    } elsif ($flag eq 'ODUES') {
-		my $items=$flags->{$flag}->{'itemlist'};
-		my $itemswaiting="<table border=1 cellspacing=0 cellpadding=2>\n";
-		my $currentcolor=$color;
-		{
-		    my $color=$currentcolor;
-		    foreach my $item (@$items) {
-			($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
-			my ($iteminformation) = getiteminformation(\%env, $item->{'itemnumber'}, 0);
-			$itemswaiting.="<tr><td><font color=red>$iteminformation->{'date_due'}</font></td><td bgcolor=$color><a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$iteminformation->{'barcode'}</a></td><td>$iteminformation->{'title'}</td></tr>\n";
-		    }
-		}
-		$itemswaiting.="</table>\n";
-		if ($query->param('module') ne 'returns'){
-  		  $flaginfotext.="<tr><td valign=top>$flag</td><td>$flags->{$flag}->{'message'}, See below</td></tr>\n";
-		} else {
-  		  $flaginfotext.="<tr><td valign=top>$flag</td><td>$flags->{$flag}->{'message'}</td></tr>\n";
-		}
-	    } else {
-		$flaginfotext.="<tr><td valign=top>$flag</td><td>$flags->{$flag}->{'message'}</td></tr>\n";
-	    }
-	}
+my $amountold = $borrower->{flags}->{'CHARGES'}->{'message'} || 0;
+my @temp = split( /\$/, $amountold );
+
+my $CGIorganisations;
+my $member_of_institution;
+if ( C4::Context->preference("memberofinstitution") ) {
+    my $organisations = get_institutions();
+    my @orgs;
+    my %org_labels;
+    foreach my $organisation ( keys %$organisations ) {
+        push @orgs, $organisation;
+        $org_labels{$organisation} =
+          $organisations->{$organisation}->{'surname'};
     }
-    ($flaginfotext) && ($flaginfotext="<tr><td  colspan=2><b>Flags</b></td></tr>$flaginfotext\n");
-    $flaginfotext.="</table>";
-    my $patrontable= << "EOF";
-<br><p>
-    <table border=1 cellpadding=5 cellspacing=0 align=right>
-    <tr><td colspan=2><font color=black><b>Patron Information</b></font></td></tr>
-    <tr><td colspan=2>
-    <a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'} onClick="openWindow(this,'Member', 480, 640)">$borrower->{'cardnumber'}</a> $borrower->{'surname'}, $borrower->{'title'} $borrower->{'firstname'}<br>$borrower->{'streetaddress'} $borrower->{'city'} Cat: $borrower->{'categorycode'} </td></tr>
-EOF
-    return($patrontable, $flaginfotext);
+    $member_of_institution = 1;
+    $CGIorganisations      = CGI::popup_menu(
+        -id     => 'organisations',
+        -name   => 'organisations',
+        -labels => \%org_labels,
+        -values => \@orgs,
+    );
 }
 
+$amountold = $temp[1];
 
-# FIXME - This clashes with &C4::Print::printslip
-sub printslip {
-    my ($env,$borrowernumber)=@_;
-    my ($borrower, $flags) = getpatroninformation($env,$borrowernumber,0);
-    $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 {$a <=> $b} keys %$borrowerissues) {
-	$issues[$i]=$borrowerissues->{$_};
-	my $dd=$issues[$i]->{'date_due'};
-	#convert to nz style dates
-	#this should be set with some kinda config variable
-	my @tempdate=split(/-/,$dd);
-	$issues[$i]->{'date_due'}="$tempdate[2]/$tempdate[1]/$tempdate[0]";
-	$i++;
-    }
-    foreach (sort {$a <=> $b} keys %$borroweriss2) {
-	$issues[$i]=$borroweriss2->{$_};
-	my $dd=$issues[$i]->{'date_due'};
-	#convert to nz style dates
-	#this should be set with some kinda config variable
-	my @tempdate=split(/-/,$dd);
-	$issues[$i]->{'date_due'}="$tempdate[2]/$tempdate[1]/$tempdate[0]";
-	$i++;
-    }
-    remoteprint($env,\@issues,$borrower);
+$template->param(
+    issued_itemtypes_count_loop => $issued_itemtypes_loop,
+    findborrower                => $findborrower,
+    borrower                    => $borrower,
+    borrowernumber              => $borrowernumber,
+    branch                      => $branch,
+    printer                     => $printer,
+    printername                 => $printer,
+    firstname                   => $borrower->{'firstname'},
+    surname                     => $borrower->{'surname'},
+    expiry                      =>
+      $borrower->{'dateexpiry'},    #format_date($borrower->{'dateexpiry'}),
+    categorycode      => $borrower->{'categorycode'},
+    streetaddress     => $borrower->{'address'},
+    emailaddress      => $borrower->{'emailaddress'},
+    borrowernotes     => $borrower->{'borrowernotes'},
+    city              => $borrower->{'city'},
+    phone             => $borrower->{'phone'},
+    cardnumber        => $borrower->{'cardnumber'},
+    amountold         => $amountold,
+    barcode           => $barcode,
+    stickyduedate     => $stickyduedate,
+    message           => $message,
+    CGIselectborrower => $CGIselectborrower,
+    todayissues       => \@realtodayissues,
+    previssues        => \@realprevissues,
+    inprocess         => $inprocess,
+    memberofinstution => $member_of_institution,
+    CGIorganisations  => $CGIorganisations,
+);
+
+# set return date if stickyduedate
+if ($stickyduedate) {
+    my $t_year  = "year" . $year;
+    my $t_month = "month" . $month;
+    my $t_day   = "day" . $day;
+    $template->param(
+        $t_year  => 1,
+        $t_month => 1,
+        $t_day   => 1,
+    );
 }
 
-# Local Variables:
-# tab-width: 8
-# End:
+#if ($branchcookie) {
+#$cookie=[$cookie, $branchcookie, $printercookie];
+#}
+
+$template->param(
+    SpecifyDueDate     => C4::Context->preference("SpecifyDueDate")
+);
+output_html_with_http_headers $query, $cookie, $template->output;