Moving "Check Out" from the action toolbar to the view menu
[koha.git] / circ / circulation.pl
index 368d54f..e307fdd 100755 (executable)
@@ -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
 #
 
 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::Auth qw/:DEFAULT get_session/;
 use C4::Date;
+use C4::Branch; # GetBranches
+use C4::Koha;   # GetPrinter
+use C4::Circulation;
+use C4::Members;
+use C4::Biblio;
+use C4::Reserves;
+use C4::Context;
+use CGI::Session;
+
+use Date::Calc qw(
+  Today
+  Today_and_Now
+  Add_Delta_YM
+  Add_Delta_Days
+  Date_to_Days
+);
+
 
 #
 # 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 $branch = getbranch($query, $branches);
-my $printer = getprinter($query, $printers);
+my $query = new CGI;
+
+# new op dev the branch and the printer are now defined by the userenv
+# but first we have to check if someone has tried to change them
+
+my $branch = $query->param('branch');
+if ($branch){
+    # update our session so the userenv is updated
+    my $dbh=C4::Context->dbh;
+    my $sessionID = $query->cookie("CGISESSID") ;
+    my $session = get_session($sessionID);
+    $session->param('branch',$branch);
+    my $branchname = GetBranchName($branch);
+    $session->param('branchname',$branchname);
+}
+
+my $printer = $query->param('printer');
+if ($printer){
+    # update our session so the userenv is updated
+       my $dbh=C4::Context->dbh;
+       my $sessionID = $query->cookie("CGISESSID") ;
+       my $session = get_session($sessionID);
+       $session->param('branchprinter',$printer);
+
+}
+
+
+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 @failedrenews = $query->param('failedrenew');
+my @renew_failed;
+for (@failedrenews) { $renew_failed[$_] = 1; } 
 
 my $findborrower = $query->param('findborrower');
-my $borrowernumber = $query->param('borrnumber');
-my $print=$query->param('print');
-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');
+$findborrower =~ s|,| |g;
+#$findborrower =~ s|'| |g;
+my $borrowernumber = $query->param('borrowernumber');
+
+$branch  = C4::Context->userenv->{'branch'};   
+$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 $duedatespec    = $query->param('duedatespec');
 my $issueconfirmed = $query->param('issueconfirmed');
-
+my $cancelreserve  = $query->param('cancelreserve');
+my $organisation   = $query->param('organisations');
+my $print          = $query->param('print');
 
 #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 $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 ($datedue,$invalidduedate);
+if($duedatespec) {
+       $datedue=  C4::Dates->new($duedatespec );
+       $invalidduedate=1 unless $datedue;
 }
+#if (defined($year)) {
+#        $duedatespec = "$year-$month-$day";
+#} else {
+#        ($year, $month, $day) = ($duedatespec) ? split /-/, $duedatespec : (0,0,0);
+#}
 
-my %env; # env is used as an "environment" variable. Could be dropped probably...
-$env{'branchcode'}=$branch;
-$env{'printer'}=$printer;
-$env{'queue'}=$printer;
+my @datearr = localtime( time() );
 
-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]));
+my $todaysdate =
+    ( 1900 + $datearr[5] )
+  . sprintf( "%0.2d", ( $datearr[4] + 1 ) )
+  . sprintf( "%0.2d", ( $datearr[3] ) );
 
-# get the borrower information.....
-my $borrower;
-if ($borrowernumber) {
-    $borrower = getpatroninformation(\%env,$borrowernumber,0);
+# check and see if we should print
+if ( $barcode eq '' && $print eq 'maybe' ) {
+    $print = 'yes';
 }
 
-# my $message;
+my $inprocess = ($barcode eq '') ? '' : $query->param('inprocess');
+
+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 = '';
+}
 
 #
 # STEP 2 : FIND BORROWER
 # if there is a list of find borrowers....
 #
 my $borrowerslist;
+my $message;
 if ($findborrower) {
-       my ($count,$borrowers)=BornameSearch(\%env,$findborrower,'web');
-       my @borrowers=@$borrowers;
-       if ($#borrowers == -1) {
-               $query->param('findborrower', '');
-       } elsif ($#borrowers == 0) {
-               $query->param('borrnumber', $borrowers[0]->{'borrowernumber'});
-               $query->param('barcode','');
-       } else {
-               $borrowerslist = \@borrowers;
-       }
+    my ( $count, $borrowers ) =
+      SearchMember($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 @lines;
+warn $borrowernumber;
+if ($borrowernumber) {
+    $borrower = GetMemberDetails( $borrowernumber, 0 );
+    my ( $od, $issue, $fines ) = GetMemberIssuesAndFines( $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'};
+    my ( $enrol_year, $enrol_month, $enrol_day ) = split /-/,
+      $borrower->{'dateenrolled'};
+    # Renew day is calculated by adding the enrolment period to today
+    my ( $renew_year, $renew_month, $renew_day ) =
+      Add_Delta_YM( $enrol_year, $enrol_month, $enrol_day,
+        0 , $borrower->{'enrolmentperiod'}) if ($enrol_year*$enrol_month*$enrol_day>0);
+    # if the expiry date is before today
+    if ( $warning_year*$warning_month*$warning_day==0 
+      || 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 => format_date($borrower->{dateexpiry}),
+            renewaldate   => format_date("$renew_year-$renew_month-$renew_day")
+        );
+    }
+    # check for NotifyBorrowerDeparture
+        if ($warning_year*$warning_month*$warning_day==0 
+      || (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" => format_date($borrower->{dateexpiry}));
+        }
+    $template->param(
+        overduecount => $od,
+        issuecount   => $issue,
+        finetotal    => $fines
+    );
 }
 
 #
@@ -112,298 +244,435 @@ if ($findborrower) {
 #
 #
 
-# check and see if we should print
-# if ($barcode eq ''  && $print eq 'maybe'){
-#      $print = 'yes';
-# }
-# if ($print eq 'yes' && $borrowernumber ne ''){
-#      printslip(\%env,$borrowernumber);
-#      $query->param('borrnumber','');
-#      $borrowernumber='';
-# }
-
 if ($barcode) {
-       $barcode = cuecatbarcodedecode($barcode);
-       my ($datedue, $invalidduedate) = fixdate($year, $month, $day);
-#      unless ($invalidduedate) {
-               my ($error, $question) = canbookbeissued(\%env, $borrower, $barcode, $year, $month, $day);
-               my $noerror=1;
-               my $noquestion = 1;
-               foreach my $impossible (keys %$error) {
-                       warn "Impossible : $impossible : ";#.%$error->{$impossible};
-                       $template->param($impossible => 1,
-                                                       IMPOSSIBLE => 1);
-                       $noerror = 0;
-               }
-               foreach my $needsconfirmation (keys %$question) {
-                       warn "needsconfirmation : $needsconfirmation : "; #.%$error->{$needsconfirmation};
-                       $template->param($needsconfirmation => 1,
-                                                       NEEDSCONFIRMATION => 1);
-                       $noquestion = 0;
-               }
-               if ($noerror && ($noquestion || $issueconfirmed)) {
-                       warn "NO ERROR";
-#                      issuebook(\%env, $borrower, $barcode, $datedue);
-               }
-
-#      }
+   # $barcode = cuecatbarcodedecode($barcode);
+    
+       if ($issueconfirmed) {
+        AddIssue( $borrower, $barcode, $datedue, $cancelreserve );
+        $inprocess = 1;
+    }
+    else {
+        my ( $error, $question ) =
+          CanBookBeIssued( $borrower, $barcode, $datedue , $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(
+                        itemhomebranch => $getmessageiteminfo->{'homebranch'} ,        
+            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 ) = GetMemberIssuesAndFines( $borrowernumber );
+        $template->param(
+        issuecount   => $issue,
+        );
 }
 
 # reload the borrower info for the sake of reseting the flags.....
 if ($borrowernumber) {
-       $borrower = getpatroninformation(\%env,$borrowernumber,0);
+    $borrower = GetMemberDetails( $borrowernumber, 0 );
 }
 
-
 ##################################################################################
 # BUILD HTML
+# show all reserves of this borrower, and the position of the reservation ....
+if ($borrowernumber) {
+
+    # new op dev
+    # now we show the status of the borrower's reservations
+    my @borrowerreserv = GetReservesFromBorrowernumber($borrowernumber );
+    my @reservloop;
+    my @WaitingReserveLoop;
+    
+    foreach my $num_res (@borrowerreserv) {
+        my %getreserv;
+        my %getWaitingReserveInfo;
+        my $getiteminfo  = GetBiblioFromItemNumber( $num_res->{'itemnumber'} );
+        my $itemtypeinfo = getitemtypeinfo( (C4::Context->preference('item-level_itype')) ? $getiteminfo->{'itype'} : $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{title}          = $getiteminfo->{'title'};
+        $getreserv{itemtype}       = $itemtypeinfo->{'description'};
+        $getreserv{author}         = $getiteminfo->{'author'};
+        $getreserv{barcodereserv}  = $getiteminfo->{'barcode'};
+        $getreserv{itemcallnumber} = $getiteminfo->{'itemcallnumber'};
+               $getreserv{biblionumber}   = $getiteminfo->{'biblionumber'};
+
+        #         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{biblionumber}   = $getiteminfo->{'biblionumber'};
+        $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 = GetBiblioData( $num_res->{'biblionumber'} );
+            my $getbibtype = getitemtypeinfo( $getbibinfo->{'itemtype'} );  # fixme - we should have item-level reserves here ?
+            $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}  = '----------';
+               $getreserv{biblionumber}    = $num_res->{'biblionumber'};
+        }
+        push( @reservloop, \%getreserv );
+
+#         if we have a reserve waiting, initiate waitingreserveloop
+        if ($getreserv{waiting} eq 1) {
+        push (@WaitingReserveLoop, \%getWaitingReserveInfo)
+        }
+      
+    }
+
+    # return result to the template
+    $template->param( 
+        countreserv => scalar @reservloop,
+        reservloop  => \@reservloop ,
+        WaitingReserveLoop  => \@WaitingReserveLoop,
+    );
+}
 
-# make the issued books table.....
-my $todaysissues='';
-my $previssues='';
-my @realtodayissues;
-my @realprevissues;
+# make the issued books table.
+my $todaysissues = '';
+my $previssues   = '';
+my @todaysissues;
+my @previousissues;
 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
+my @issued_itemtypes_count_loop;
+
 if ($borrower) {
+
 # get each issue of the borrower & separate them in todayissues & previous issues
-       my @todaysissues;
-       my @previousissues;
-       my $issueslist = getissues($borrower);
-       # split in 2 arrays for today & previous
-       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 ($countissues,$issueslist) = GetPendingIssues($borrower->{'borrowernumber'});
+
+    # split in 2 arrays for today & previous
+    foreach my $it ( @$issueslist ) {
+        my $issuedate = $it->{'issuedate'};
+        $issuedate =~ s/-//g;
+        $issuedate = substr( $issuedate, 0, 8 );
+               ($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'});
+               ($restype) and $it->{'can_renew'} = 0;
+
+               $it->{'dd'} = format_date($it->{'date_due'});
+        my $datedue = $it->{'date_due'};
+        $datedue =~ s/-//g;
+               $it->{'od'} = ($datedue < $todaysdate) ? 1 : 0 ;
+        ($it->{'author'} eq '') and $it->{'author'} = ' ';
+        $it->{'renew_failed'} = $renew_failed[$it->{'itemnumber'}];
+        # ADDED BY JF: NEW ITEMTYPE COUNT DISPLAY
+        $issued_itemtypes_count->{ $it->{'itemtype'} }++;
+
+        if ( $todaysdate == $issuedate ) {
+            push @todaysissues, $it;
+        } else {
+            push @previousissues, $it;
+        }
+    }
+    @todaysissues   = sort { $b->{'timestamp'} <=> $a->{'timestamp'} } @todaysissues;
+    @previousissues = sort { $b->{'date_due' } <=> $a->{'date_due' } } @previousissues;
+    my $i = 1;
+       foreach my $book (@todaysissues) {
+        $book->{'togglecolor'} = (++$i % 2) ? 0 : 1 ;
+    }
+    $i = 1;
+       foreach my $book (@previousissues) {
+        $book->{'togglecolor'} = (++$i % 2) ? 0 : 1 ;
     }
-       my $od; # overdues
-       my $togglecolor;
-       # parses today & build Template array
-       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) {
-                       $od = 1;
-               } else {
-                       $od=0;
-               }
-               $book->{'od'}=$od;
-               $book->{'dd'}=$dd;
-               $book->{'tcolor'}=$togglecolor;
-               if ($togglecolor) {
-                       $togglecolor=0;
-               } else {
-                       $togglecolor=1;
-               }
-               if ($book->{'author'} eq ''){
-                       $book->{'author'}=' ';
-               }    
-               push @realtodayissues,$book;
-       }
-    
-       # parses previous & build Template array
-    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);
-               my $pcolor = '';
-               my $od = '';
-               $datedue=~s/-//g;
-               if ($datedue < $todaysdate) {
-                       $od = 1;
-               } else {
-                       $od = 0;
-               }
-               $book->{'tcolor'}=$togglecolor;
-               if ($togglecolor) {
-                       $togglecolor=0;
-               } else {
-                       $togglecolor=1;
-               }
-               $book->{'dd'}=$dd; 
-               $book->{'od'}=$od;
-               $book->{'tcolor'}=$pcolor;
-               if ($book->{'author'} eq ''){
-                       $book->{'author'}=' ';
-               }    
-               push @realprevissues,$book
-       }
 }
 
+#### 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;  # huh?
+$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_loop, $data;
+    }
+}
+$issued_itemtypes_loop = \@issued_itemtypes_count_loop;
+
+#### / 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 );
+    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',
+               -class     => 'focus',
+               -id          => 'borrowernumber',
+        -values   => \@values,
+        -labels   => \%labels,
+        -size     => 7,
+        -tabindex => '',
+        -multiple => 0
+    );
 }
-#title
 
-my ($patrontable, $flaginfotable) = patrontable($borrower);
-my $amountold=$borrower->{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'},
-#              title => $iteminformation->{'title'},
-#              author => $iteminformation->{'author'},
-               firstname => $borrower->{'firstname'},
-               surname => $borrower->{'surname'},
-               categorycode => $borrower->{'categorycode'},
-               streetaddress => $borrower->{'streetaddress'},
-               city => $borrower->{'city'},
-               phone => $borrower->{'phone'},
-               cardnumber => $borrower->{'cardnumber'},
-               amountold => $amountold,
-               barcode => $barcode,
-               stickyduedate => $stickyduedate,
-               CGIselectborrower => $CGIselectborrower,
-               todayissues => \@realtodayissues,
-               previssues => \@realprevissues,
-       );
-# 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,
-       );
+#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'}
+            );
+        }
+    }
 }
 
-
-if ($branchcookie) {
-    $cookie=[$cookie, $branchcookie, $printercookie];
+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'};
+    }
+    $member_of_institution = 1;
+    $CGIorganisations      = CGI::popup_menu(
+        -id     => 'organisations',
+        -name   => 'organisations',
+        -labels => \%org_labels,
+        -values => \@orgs,
+    );
 }
 
-output_html_with_http_headers $query, $cookie, $template->output;
+$amountold = $temp[1];
 
-####################################################################
-# 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;
-    }
-}
+my $borrowercategory = GetBorrowercategory( $borrower->{'categorycode'} );
+my $category_type = $borrowercategory->{'category_type'};
+( $template->param( adultborrower => 1 ) ) if ( $category_type eq 'A' );
 
+$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'},
+    address     => $borrower->{'address'},
+    address2     => $borrower->{'address2'},
+    email      => $borrower->{'email'},
+       emailpro           => $borrower->{'emailpro'},
+    borrowernotes     => $borrower->{'borrowernotes'},
+    city              => $borrower->{'city'},
+    phone             => $borrower->{'phone'} || $borrower->{'mobile'},
+    cardnumber        => $borrower->{'cardnumber'},
+    amountold         => $amountold,
+    barcode           => $barcode,
+    stickyduedate     => $stickyduedate,
+    message           => $message,
+    CGIselectborrower => $CGIselectborrower,
+    todayissues       => \@todaysissues,
+    previssues        => \@previousissues,
+    inprocess         => $inprocess,
+    memberofinstution => $member_of_institution,
+    CGIorganisations  => $CGIorganisations,
+       circview => 1,
+       
+);
 
-sub patrontable {
-    my ($borrower) = @_;
-    my $flags = $borrower->{'flags'};
-    my $flaginfotable='';
-    my $flaginfotext;
-    #my $flaginfotext='';
-    my $flag;
-    my $color='';
-    foreach $flag (sort keys %$flags) {
-       $flags->{$flag}->{'message'}=~s/\n/<br>/g;
-       if ($flags->{$flag}->{'noissues'}) {
-               $template->param(
-                       noissues => 'true',
-                       color => $color,
-                        );
-               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'}
-                                );
-               }
-       } else {
-                if ($flag eq 'CHARGES') {
-                       $template->param(
-                               charges => 'true',
-                               chargesmsg => $flags->{'CHARGES'}->{'message'}
-                        );
-               }
-               if ($flag eq 'WAITING') {
-                       my $items=$flags->{$flag}->{'itemlist'};
-                       my @itemswaiting;
-                       foreach my $item (@$items) {
-                       my ($iteminformation) = getiteminformation(\%env, $item->{'itemnumber'}, 0);
-                       $iteminformation->{'branchname'} = $branches->{$iteminformation->{'holdingbranch'}}->{'branchname'};
-                       push @itemswaiting, $iteminformation;
-                       }
-                       $template->param(
-                               waiting => 'true',
-                               waitingmsg => $flags->{'WAITING'}->{'message'},
-                               itemswaiting => \@itemswaiting,
-                                );
-               }
-               if ($flag eq 'ODUES') {
-                       $template->param(
-                               odues => 'true',
-                               oduesmsg => $flags->{'ODUES'}->{'message'}
-                                );
-
-                       my $items=$flags->{$flag}->{'itemlist'};
-                       my $currentcolor=$color;
-                       {
-                       my $color=$currentcolor;
-                           my @itemswaiting;
-                       foreach my $item (@$items) {
-#                              ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
-                               my ($iteminformation) = getiteminformation(\%env, $item->{'itemnumber'}, 0);
-                               push @itemswaiting, $iteminformation;
-                       }
-                       }
-                       if ($query->param('module') ne 'returns'){
-                               $template->param( nonreturns => 'true' );
-                       }
-               }
-               if ($flag eq 'NOTES') {
-                       $template->param(
-                               notes => 'true',
-                               notesmsg => $flags->{'NOTES'}->{'message'}
-                                );
-               }
-       }
-    }
-    return($patrontable, $flaginfotext);
+# set return date if stickyduedate
+if ($stickyduedate) {
+    $template->param(
+        duedatespec => $duedatespec,
+    );
 }
 
-# Local Variables:
-# tab-width: 8
-# End:
+#if ($branchcookie) {
+#$cookie=[$cookie, $branchcookie, $printercookie];
+#}
+
+$template->param(
+               SpecifyDueDate     => C4::Context->preference("SpecifyDueDate"),
+               CircAutocompl => C4::Context->preference("CircAutocompl") ,
+               DHTMLformat   => C4::Dates->DHTMLcalendar(),
+);
+output_html_with_http_headers $query, $cookie, $template->output;