update sample news on new install with koha-community.org urls
[koha.git] / circ / circulation.pl
index 39f9c18..4b67920 100755 (executable)
@@ -1,7 +1,5 @@
 #!/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
 
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
+#use warnings; FIXME - Bug 2505
 use CGI;
 use C4::Output;
 use C4::Print;
-use C4::Auth;
-use C4::Date;
+use C4::Auth qw/:DEFAULT get_session/;
+use C4::Dates qw/format_date/;
 use C4::Branch; # GetBranches
 use C4::Koha;   # GetPrinter
 use C4::Circulation;
@@ -39,7 +38,6 @@ use CGI::Session;
 
 use Date::Calc qw(
   Today
-  Today_and_Now
   Add_Delta_YM
   Add_Delta_Days
   Date_to_Days
@@ -51,30 +49,32 @@ use Date::Calc qw(
 #
 my $query = new CGI;
 
-# new op dev the branch and the printer are now defined by the userenv
+my $sessionID = $query->cookie("CGISESSID") ;
+my $session = get_session($sessionID);
+
+# branch and 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 = new CGI::Session("driver:MySQL", $sessionID, {Handle=>$dbh});
-    $session->param('branch',$branch);
-    my $branchname = GetBranchName($branch);
-    $session->param('branchname',$branchname);
+    $session->param('branch', $branch);
+    $session->param('branchname', GetBranchName($branch));
 }
 
 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 = new CGI::Session("driver:MySQL", $sessionID, {Handle=>$dbh});
-       $session->param('branchprinter',$printer);
-
+    $session->param('branchprinter', $printer);
 }
 
+if (!C4::Context->userenv && !$branch){
+    if ($session->param('branch') eq 'NO_LIBRARY_SET'){
+        # no branch set we can't issue
+        print $query->redirect("/cgi-bin/koha/circ/selectbranchprinter.pl");
+        exit;
+    }
+}
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user (
     {
@@ -82,58 +82,90 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user (
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { circulate => 1 },
+        flagsrequired   => { circulate => 'circulate_remaining_permissions' },
     }
 );
-my $branches = GetBranches();
 
-my $printers = GetPrinters();
+my $branches = GetBranches();
 
+my @failedrenews = $query->param('failedrenew');    # expected to be itemnumbers 
+my %renew_failed;
+for (@failedrenews) { $renew_failed{$_} = 1; }
 
 my $findborrower = $query->param('findborrower');
 $findborrower =~ s|,| |g;
-#$findborrower =~ s|'| |g;
 my $borrowernumber = $query->param('borrowernumber');
 
-$branch  = C4::Context->userenv->{'branch'};   
+$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,
-            );
-        }
+# If AutoLocation is not activated, we show the Circulation Parameters to chage settings of librarian
+if (C4::Context->preference("AutoLocation") != 1) {
+    $template->param(ManualLocation => 1);
+}
+
+if (C4::Context->preference("DisplayClearScreenButton")) {
+    $template->param(DisplayClearScreenButton => 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');
+$barcode =~  s/^\s*|\s*$//g; # remove leading/trailing whitespace
+
+$barcode = barcodedecode($barcode) if( $barcode && C4::Context->preference('itemBarcodeInputFilter'));
+my $stickyduedate  = $query->param('stickyduedate') || $session->param('stickyduedate');
+my $duedatespec    = $query->param('duedatespec')   || $session->param('stickyduedate');
 my $issueconfirmed = $query->param('issueconfirmed');
 my $cancelreserve  = $query->param('cancelreserve');
 my $organisation   = $query->param('organisations');
 my $print          = $query->param('print');
+my $newexpiry      = $query->param('dateexpiry');
+my $debt_confirmed = $query->param('debt_confirmed') || 0; # Don't show the debt error dialog twice
+
+# Check if stickyduedate is turned off
+if ( $barcode ) {
+    # was stickyduedate loaded from session?
+    if ( $stickyduedate && ! $query->param("stickyduedate") ) {
+        $session->clear( 'stickyduedate' );
+        $stickyduedate  = $query->param('stickyduedate');
+        $duedatespec    = $query->param('duedatespec');
+    }
+}
 
-#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 ($datedue,$invalidduedate,$globalduedate);
 
-my @datearr = localtime( time() );
+if(C4::Context->preference('globalDueDate') && (C4::Context->preference('globalDueDate') =~ C4::Dates->regexp('syspref'))){
+        $globalduedate = C4::Dates->new(C4::Context->preference('globalDueDate'));
+}
+my $duedatespec_allow = C4::Context->preference('SpecifyDueDate');
+if($duedatespec_allow){
+    if ($duedatespec) {
+        if ($duedatespec =~ C4::Dates->regexp('syspref')) {
+            my $tempdate = C4::Dates->new($duedatespec);
+            if ($tempdate and $tempdate->output('iso') gt C4::Dates->new()->output('iso')) {
+                # i.e., it has to be later than today/now
+                $datedue = $tempdate;
+            } else {
+                $invalidduedate = 1;
+                $template->param(IMPOSSIBLE=>1, INVALID_DATE=>$duedatespec);
+            }
+        } else {
+            $invalidduedate = 1;
+            $template->param(IMPOSSIBLE=>1, INVALID_DATE=>$duedatespec);
+        }
+    } else {
+        # pass global due date to tmpl if specifyduedate is true 
+        # and we have no barcode (loading circ page but not checking out)
+        if($globalduedate &&  ! $barcode ){
+            $duedatespec = $globalduedate->output();
+            $stickyduedate = 1;
+        }
+    }
+} else {
+    $datedue = $globalduedate if ($globalduedate);
+}
 
-# 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 = C4::Dates->new->output('iso');
 
 # check and see if we should print
 if ( $barcode eq '' && $print eq 'maybe' ) {
@@ -141,7 +173,6 @@ if ( $barcode eq '' && $print eq 'maybe' ) {
 }
 
 my $inprocess = ($barcode eq '') ? '' : $query->param('inprocess');
-
 if ( $barcode eq '' && $query->param('charges') eq 'yes' ) {
     $template->param(
         PAYCHARGES     => 'yes',
@@ -162,9 +193,18 @@ if ( $print eq 'yes' && $borrowernumber ne '' ) {
 my $borrowerslist;
 my $message;
 if ($findborrower) {
-    my ( $count, $borrowers ) =
-      SearchMember($findborrower, 'cardnumber', 'web' );
+    my ($count, $borrowers) = SearchMember($findborrower, 'cardnumber', 'web');
     my @borrowers = @$borrowers;
+    if (C4::Context->preference("AddPatronLists")) {
+        $template->param(
+            "AddPatronLists_".C4::Context->preference("AddPatronLists")=> "1",
+        );
+        if (C4::Context->preference("AddPatronLists")=~/code/){
+            my $categories = GetBorrowercategoryList;
+            $categories->[0]->{'first'} = 1;
+            $template->param(categories=>$categories);
+        }
+    }
     if ( $#borrowers == -1 ) {
         $query->param( 'findborrower', '' );
         $message = "'$findborrower'";
@@ -181,43 +221,46 @@ if ($findborrower) {
 
 # get the borrower information.....
 my $borrower;
-my @lines;
-
 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'};
+    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
+    my (  $renew_year,   $renew_month,   $renew_day);
+    if ($enrol_year*$enrol_month*$enrol_day>0) {
+        (  $renew_year,   $renew_month,   $renew_day) =
+        Add_Delta_YM( $enrol_year, $enrol_month, $enrol_day,
+            0 , $borrower->{'enrolmentperiod'});
+    }
+    # if the expiry date is before today ie they have expired
     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 ) )
+        || 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
+        #borrowercard expired, no issues
         $template->param(
-            flagged       => "1",
-            warndeparture => format_date($borrower->{dateexpiry}),
-            renewaldate   => format_date("$renew_year-$renew_month-$renew_day")
+            flagged  => "1",
+            noissues => "1",
+            expired     => 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') &&
+    elsif ( 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}));
+            Date_to_Days( $today_year, $today_month, $today_day ) ) 
+    {
+        # borrower card soon to expire warn librarian
+        $template->param("warndeparture" => format_date($borrower->{dateexpiry}),
+        flagged       => "1",);
+        if (C4::Context->preference('ReturnBeforeExpiry')){
+            $template->param("returnbeforeexpiry" => 1);
         }
+    }
     $template->param(
         overduecount => $od,
         issuecount   => $issue,
@@ -229,54 +272,50 @@ if ($borrowernumber) {
 # STEP 3 : ISSUING
 #
 #
-
 if ($barcode) {
-    $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($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;
-        }
+    # always check for blockers on issuing
+    my ( $error, $question ) =
+    CanBookBeIssued( $borrower, $barcode, $datedue , $inprocess );
+    my $blocker = $invalidduedate ? 1 : 0;
+
+    delete $question->{'DEBT'} if ($debt_confirmed);
+    foreach my $impossible ( keys %$error ) {
         $template->param(
-            day   => $day,
-            month => $month,
-            year  => $year
+            $impossible => $$error{$impossible},
+            IMPOSSIBLE  => 1
         );
-        if ( $noerror && ( $noquestion || $issueconfirmed ) ) {
-            AddIssue( $borrower, $barcode, $datedue );
+        $blocker = 1;
+    }
+    if( !$blocker ){
+        my $confirm_required = 0;
+        unless($issueconfirmed){
+            #  Get the item title for more information
+            my $getmessageiteminfo  = GetBiblioFromItemNumber(undef,$barcode);
+            $template->param( itemhomebranch => $getmessageiteminfo->{'homebranch'} );
+
+            # pass needsconfirmation to template if issuing is possible and user hasn't yet confirmed.
+            foreach my $needsconfirmation ( keys %$question ) {
+                $template->param(
+                    $needsconfirmation => $$question{$needsconfirmation},
+                    getTitleMessageIteminfo => $getmessageiteminfo->{'title'},
+                    NEEDSCONFIRMATION  => 1
+                );
+                $confirm_required = 1;
+            }
+        }
+        unless($confirm_required) {
+            AddIssue( $borrower, $barcode, $datedue, $cancelreserve );
             $inprocess = 1;
+            if($globalduedate && ! $stickyduedate && $duedatespec_allow ){
+                $duedatespec = $globalduedate->output();
+                $stickyduedate = 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,
-        );
+    # FIXME If the issue is confirmed, we launch another time GetMemberIssuesAndFines, 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.....
@@ -299,7 +338,7 @@ if ($borrowernumber) {
         my %getreserv;
         my %getWaitingReserveInfo;
         my $getiteminfo  = GetBiblioFromItemNumber( $num_res->{'itemnumber'} );
-        my $itemtypeinfo = getitemtypeinfo( (C4::Context->preference('item-level_itype')) ? $getiteminfo->{'ccode'} : $getiteminfo->{'itemtype'} );
+        my $itemtypeinfo = getitemtypeinfo( (C4::Context->preference('item-level_itypes')) ? $getiteminfo->{'itype'} : $getiteminfo->{'itemtype'} );
         my ( $transfertwhen, $transfertfrom, $transfertto ) =
           GetTransfers( $num_res->{'itemnumber'} );
 
@@ -313,21 +352,20 @@ if ($borrowernumber) {
         $getreserv{author}         = $getiteminfo->{'author'};
         $getreserv{barcodereserv}  = $getiteminfo->{'barcode'};
         $getreserv{itemcallnumber} = $getiteminfo->{'itemcallnumber'};
-
+        $getreserv{biblionumber}   = $getiteminfo->{'biblionumber'};
+        $getreserv{waitingat}      = GetBranchName( $num_res->{'branchcode'} );
         #         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{biblionumber} = $getiteminfo->{'biblionumber'};
+        $getWaitingReserveInfo{itemtype}     = $itemtypeinfo->{'description'};
+        $getWaitingReserveInfo{author}       = $getiteminfo->{'author'};
+        $getWaitingReserveInfo{reservedate}  = format_date( $num_res->{'reservedate'} );
         $getWaitingReserveInfo{waitingat}    = GetBranchName( $num_res->{'branchcode'} );
-        }
-    
+        $getWaitingReserveInfo{waitinghere}  = 1 if $num_res->{'branchcode'} eq $branch;
         }
         #         check transfers with the itemnumber foud in th reservation loop
         if ($transfertwhen) {
@@ -335,33 +373,27 @@ if ($borrowernumber) {
             $getreserv{transfered} = 1;
             $getreserv{datesent}   = format_date($transfertwhen);
             $getreserv{frombranch} = GetBranchName($transfertfrom);
-        }
-
-        if ( ( $getiteminfo->{'holdingbranch'} ne $num_res->{'branchcode'} )
-            and not $transfertwhen )
-        {
+        } elsif ($getiteminfo->{'holdingbranch'} ne $num_res->{'branchcode'}) {
             $getreserv{nottransfered}   = 1;
-            $getreserv{nottransferedby} =
-              GetBranchName( $getiteminfo->{'holdingbranch'} );
+            $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'} );  # fixme - we should have item-level reserves here ?
+            my $getbibinfo = GetBiblioData( $num_res->{'biblionumber'} );
+
             $getreserv{color}           = 'inwait';
             $getreserv{title}           = $getbibinfo->{'title'};
-            $getreserv{waitingposition} = $num_res->{'priority'};
             $getreserv{nottransfered}   = 0;
-            $getreserv{itemtype}        = $getbibtype->{'description'};
+            $getreserv{itemtype}        = $itemtypeinfo->{'description'};
             $getreserv{author}          = $getbibinfo->{'author'};
-            $getreserv{itemcallnumber}  = '----------';
-
+            $getreserv{biblionumber}    = $num_res->{'biblionumber'};
         }
+        $getreserv{waitingposition} = $num_res->{'priority'};
         push( @reservloop, \%getreserv );
 
 #         if we have a reserve waiting, initiate waitingreserveloop
-        if ($getreserv{waiting} eq 1) {
+        if ($getreserv{waiting} == 1) {
         push (@WaitingReserveLoop, \%getWaitingReserveInfo)
         }
       
@@ -373,6 +405,7 @@ if ($borrowernumber) {
         reservloop  => \@reservloop ,
         WaitingReserveLoop  => \@WaitingReserveLoop,
     );
+    $template->param( adultborrower => 1 ) if ( $borrower->{'category_type'} eq 'A' );
 }
 
 # make the issued books table.
@@ -380,58 +413,62 @@ 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;
+my $totalprice = 0;
 
 if ($borrower) {
-
 # get each issue of the borrower & separate them in todayissues & previous issues
-    my ($countissues,$issueslist) = GetPendingIssues($borrower->{'borrowernumber'});
-
+    my ($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'} = ' ';
+        my $itemtypeinfo = getitemtypeinfo( (C4::Context->preference('item-level_itypes')) ? $it->{'itype'} : $it->{'itemtype'} );
+        # set itemtype per item-level_itype syspref - FIXME this is an ugly hack
+        $it->{'itemtype'} = ( C4::Context->preference( 'item-level_itypes' ) ) ? $it->{'itype'} : $it->{'itemtype'};
 
+        ($it->{'charge'}, $it->{'itemtype_charge'}) = GetIssuingCharges(
+            $it->{'itemnumber'}, $borrower->{'borrowernumber'}
+        );
+        $it->{'charge'} = sprintf("%.2f", $it->{'charge'});
+        my ($can_renew, $can_renew_error) = CanBookBeRenewed( 
+            $borrower->{'borrowernumber'},$it->{'itemnumber'}
+        );
+        $it->{"renew_error_${can_renew_error}"} = 1 if defined $can_renew_error;
+        my ( $restype, $reserves ) = CheckReserves( $it->{'itemnumber'} );
+        $it->{'can_renew'} = $can_renew;
+        $it->{'can_confirm'} = !$can_renew && !$restype;
+        $it->{'renew_error'} = $restype;
+        $it->{'checkoutdate'} = C4::Dates->new($it->{'issuedate'},'iso')->output('syspref');
+
+        $totalprice += $it->{'replacementprice'};
+        $it->{'itemtype'} = $itemtypeinfo->{'description'};
+        $it->{'itemtype_image'} = $itemtypeinfo->{'imageurl'};
+        $it->{'dd'} = format_date($it->{'date_due'});
+        $it->{'displaydate'} = format_date($it->{'issuedate'});
+        $it->{'od'} = ( $it->{'date_due'} lt $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 ) {
+        if ( $todaysdate eq $it->{'issuedate'} or $todaysdate eq $it->{'lastreneweddate'} ) {
             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 ;
+    if ( C4::Context->preference( "todaysIssuesDefaultSortOrder" ) eq 'asc' ) {
+        @todaysissues   = sort { $a->{'timestamp'} cmp $b->{'timestamp'} } @todaysissues;
+    }
+    else {
+        @todaysissues   = sort { $b->{'timestamp'} cmp $a->{'timestamp'} } @todaysissues;
+    }
+    if ( C4::Context->preference( "previousIssuesDefaultSortOrder" ) eq 'asc' ){
+        @previousissues = sort { $a->{'date_due'} cmp $b->{'date_due'} } @previousissues;
     }
-    $i = 1;
-       foreach my $book (@previousissues) {
-        $book->{'togglecolor'} = (++$i % 2) ? 0 : 1 ;
+    else {
+        @previousissues = sort { $b->{'date_due'} cmp $a->{'date_due'} } @previousissues;
     }
 }
 
@@ -441,14 +478,13 @@ if ($borrower) {
 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_loop;  # huh?
-$issueqty_sth->execute("*");
+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=?'
+);
+$issueqty_sth->execute(q{*}); # This is a literal asterisk, not a wildcard.
+
 while ( my $data = $issueqty_sth->fetchrow_hashref() ) {
 
     # subtract how many of each this borrower has
@@ -458,16 +494,14 @@ while ( my $data = $issueqty_sth->fetchrow_hashref() ) {
           $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" ) )
-    {
+    if ( $data->{'left'} < 0 ) { $data->{'left'} = '0' }
+    if ( $data->{maxissueqty} <= $data->{count} ) {
+        $data->{flag} = 1;
+    }
+    if ( $data->{maxissueqty} > 0 && $data->{itemtype} !~m/^(\*|CIRC)$/ ) {
         push @issued_itemtypes_count_loop, $data;
     }
 }
-$issued_itemtypes_loop = \@issued_itemtypes_count_loop;
 
 #### / JF
 
@@ -476,10 +510,7 @@ my %labels;
 my $CGIselectborrower;
 if ($borrowerslist) {
     foreach (
-        sort {
-                $a->{'surname'}
-              . $a->{'firstname'} cmp $b->{'surname'}
-              . $b->{'firstname'}
+        sort {(lc $a->{'surname'} cmp lc $b->{'surname'} || lc $a->{'firstname'} cmp lc $b->{'firstname'})
         } @$borrowerslist
       )
     {
@@ -489,10 +520,11 @@ if ($borrowerslist) {
     }
     $CGIselectborrower = CGI::scrolling_list(
         -name     => 'borrowernumber',
-               -class     => 'focus',
-               -id          => 'borrowernumber',
+        -class    => 'focus',
+        -id       => 'borrowernumber',
         -values   => \@values,
         -labels   => \%labels,
+       -onclick  => "window.location = '/cgi-bin/koha/circ/circulation.pl?borrowernumber=' + this.value;",
         -size     => 7,
         -tabindex => '',
         -multiple => 0
@@ -501,11 +533,9 @@ if ($borrowerslist) {
 
 #title
 my $flags = $borrower->{'flags'};
-my $flag;
-
-foreach $flag ( sort keys %$flags ) {
-
-    $flags->{$flag}->{'message'} =~ s/\n/<br>/g;
+foreach my $flag ( sort keys %$flags ) {
+    $template->param( flagged=> 1);
+    $flags->{$flag}->{'message'} =~ s#\n#<br />#g;
     if ( $flags->{$flag}->{'noissues'} ) {
         $template->param(
             flagged  => 1,
@@ -514,22 +544,25 @@ foreach $flag ( sort keys %$flags ) {
         if ( $flag eq 'GNA' ) {
             $template->param( gna => 'true' );
         }
-        if ( $flag eq 'LOST' ) {
+        elsif ( $flag eq 'LOST' ) {
             $template->param( lost => 'true' );
         }
-        if ( $flag eq 'DBARRED' ) {
+        elsif ( $flag eq 'DBARRED' ) {
             $template->param( dbarred => 'true' );
         }
-        if ( $flag eq 'CHARGES' ) {
+        elsif ( $flag eq 'CHARGES' ) {
             $template->param(
                 charges    => 'true',
-                chargesmsg => $flags->{'CHARGES'}->{'message'}
+                chargesmsg => $flags->{'CHARGES'}->{'message'},
+                chargesamount => $flags->{'CHARGES'}->{'amount'},
+                charges_is_blocker => 1
             );
         }
-        if ( $flag eq 'CREDITS' ) {
+        elsif ( $flag eq 'CREDITS' ) {
             $template->param(
                 credits    => 'true',
-                creditsmsg => $flags->{'CREDITS'}->{'message'}
+                creditsmsg => $flags->{'CREDITS'}->{'message'},
+                creditsamount => sprintf("%.02f", -($flags->{'CREDITS'}->{'amount'})), # from patron's pov
             );
         }
     }
@@ -538,16 +571,18 @@ foreach $flag ( sort keys %$flags ) {
             $template->param(
                 charges    => 'true',
                 flagged    => 1,
-                chargesmsg => $flags->{'CHARGES'}->{'message'}
+                chargesmsg => $flags->{'CHARGES'}->{'message'},
+                chargesamount => $flags->{'CHARGES'}->{'amount'},
             );
         }
-        if ( $flag eq 'CREDITS' ) {
+        elsif ( $flag eq 'CREDITS' ) {
             $template->param(
                 credits    => 'true',
-                creditsmsg => $flags->{'CREDITS'}->{'message'}
+                creditsmsg => $flags->{'CREDITS'}->{'message'},
+                creditsamount => sprintf("%.02f", -($flags->{'CREDITS'}->{'amount'})), # from patron's pov
             );
         }
-        if ( $flag eq 'ODUES' ) {
+        elsif ( $flag eq 'ODUES' ) {
             $template->param(
                 odues    => 'true',
                 flagged  => 1,
@@ -555,20 +590,11 @@ foreach $flag ( sort keys %$flags ) {
             );
 
             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' ) {
+            if ( ! $query->param('module') || $query->param('module') ne 'returns' ) {
                 $template->param( nonreturns => 'true' );
             }
         }
-        if ( $flag eq 'NOTES' ) {
+        elsif ( $flag eq 'NOTES' ) {
             $template->param(
                 notes    => 'true',
                 flagged  => 1,
@@ -579,7 +605,16 @@ foreach $flag ( sort keys %$flags ) {
 }
 
 my $amountold = $borrower->{flags}->{'CHARGES'}->{'message'} || 0;
-my @temp = split( /\$/, $amountold );
+$amountold =~ s/^.*\$//;    # remove upto the $, if any
+
+my ( $total, $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber );
+
+if ( $borrower->{'category_type'} eq 'C') {
+    my  ( $catcodes, $labels ) =  GetborCatFromCatType( 'A', 'WHERE category_type = ?' );
+    my $cnt = scalar(@$catcodes);
+    $template->param( 'CATCODE_MULTI' => 1) if $cnt > 1;
+    $template->param( 'catcode' =>    $catcodes->[0])  if $cnt == 1;
+}
 
 my $CGIorganisations;
 my $member_of_institution;
@@ -589,8 +624,7 @@ if ( C4::Context->preference("memberofinstitution") ) {
     my %org_labels;
     foreach my $organisation ( keys %$organisations ) {
         push @orgs, $organisation;
-        $org_labels{$organisation} =
-          $organisations->{$organisation}->{'surname'};
+        $org_labels{$organisation} = $organisations->{$organisation}->{'surname'};
     }
     $member_of_institution = 1;
     $CGIorganisations      = CGI::popup_menu(
@@ -601,59 +635,87 @@ if ( C4::Context->preference("memberofinstitution") ) {
     );
 }
 
-$amountold = $temp[1];
+my $lib_messages_loop = GetMessages( $borrowernumber, 'L', $branch );
+if($lib_messages_loop){ $template->param(flagged => 1 ); }
+
+my $bor_messages_loop = GetMessages( $borrowernumber, 'B', $branch );
+if($bor_messages_loop){ $template->param(flagged => 1 ); }
+
+# Computes full borrower address
+my (undef, $roadttype_hashref) = &GetRoadTypes();
+my $address = $borrower->{'streetnumber'}.' '.$roadttype_hashref->{$borrower->{'streettype'}}.' '.$borrower->{'address'};
 
 $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'}),
+    issued_itemtypes_count_loop => \@issued_itemtypes_count_loop,
+    lib_messages_loop => $lib_messages_loop,
+    bor_messages_loop => $bor_messages_loop,
+    all_messages_del  => C4::Context->preference('AllowAllMessageDeletion'),
+    findborrower      => $findborrower,
+    borrower          => $borrower,
+    borrowernumber    => $borrowernumber,
+    branch            => $branch,
+    branchname        => GetBranchName($borrower->{'branchcode'}),
+    printer           => $printer,
+    printername       => $printer,
+    firstname         => $borrower->{'firstname'},
+    surname           => $borrower->{'surname'},
+    dateexpiry        => format_date($newexpiry),
+    expiry            => format_date($borrower->{'dateexpiry'}),
     categorycode      => $borrower->{'categorycode'},
-    address     => $borrower->{'address'},
-    address2     => $borrower->{'address2'},
-    email      => $borrower->{'email'},
-       emailpro           => $borrower->{'emailpro'},
+    categoryname      => $borrower->{description},
+    address           => $address,
+    address2          => $borrower->{'address2'},
+    email             => $borrower->{'email'},
+    emailpro          => $borrower->{'emailpro'},
     borrowernotes     => $borrower->{'borrowernotes'},
     city              => $borrower->{'city'},
+    zipcode           => $borrower->{'zipcode'},
+    country           => $borrower->{'country'},
     phone             => $borrower->{'phone'} || $borrower->{'mobile'},
     cardnumber        => $borrower->{'cardnumber'},
     amountold         => $amountold,
     barcode           => $barcode,
     stickyduedate     => $stickyduedate,
+    duedatespec       => $duedatespec,
     message           => $message,
     CGIselectborrower => $CGIselectborrower,
+    totalprice        => sprintf('%.2f', $totalprice),
+    totaldue          => sprintf('%.2f', $total),
     todayissues       => \@todaysissues,
     previssues        => \@previousissues,
     inprocess         => $inprocess,
     memberofinstution => $member_of_institution,
     CGIorganisations  => $CGIorganisations,
+    is_child          => ($borrower->{'category_type'} eq 'C'),
+    circview => 1,
+    soundon           => C4::Context->preference("SoundOn"),
 );
 
-# set return date if stickyduedate
+# save stickyduedate to session
 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,
-    );
+    $session->param( 'stickyduedate', $duedatespec );
 }
 
-#if ($branchcookie) {
-#$cookie=[$cookie, $branchcookie, $printercookie];
-#}
+my ($picture, $dberror) = GetPatronImage($borrower->{'cardnumber'});
+$template->param( picture => 1 ) if $picture;
+
+# get authorised values with type of BOR_NOTES
+my @canned_notes;
+my $sth = $dbh->prepare('SELECT * FROM authorised_values WHERE category = "BOR_NOTES"');
+$sth->execute();
+while ( my $row = $sth->fetchrow_hashref() ) {
+  push @canned_notes, $row;
+}
+if ( scalar( @canned_notes ) ) {
+  $template->param( canned_bor_notes_loop => \@canned_notes );
+}
 
 $template->param(
-    SpecifyDueDate     => C4::Context->preference("SpecifyDueDate")
+    debt_confirmed            => $debt_confirmed,
+    SpecifyDueDate            => $duedatespec_allow,
+    CircAutocompl             => C4::Context->preference("CircAutocompl"),
+       AllowRenewalLimitOverride => C4::Context->preference("AllowRenewalLimitOverride"),
+    dateformat                => C4::Context->preference("dateformat"),
+    DHTMLcalendar_dateformat  => C4::Dates->DHTMLcalendar(),
 );
-$template->param( CircAutocompl => C4::Context->preference("CircAutocompl") );
 output_html_with_http_headers $query, $cookie, $template->output;