X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=circ%2Fcirculation.pl;h=e0adbf5d57206e2d1ae740a4e8f2dbcd820d4f12;hb=81217fc48ecb7ccbb173b85de26e6d94b96b79b6;hp=8664b4afbd138bf3e2f497efb5a5582aec92052c;hpb=2c5b25c1fcae11fa4af974924a502657732b9521;p=koha.git

diff --git a/circ/circulation.pl b/circ/circulation.pl
index 8664b4afbd..e0adbf5d57 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -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
 
@@ -23,6 +21,7 @@
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
+# use warnings;  # FIXME
 use CGI;
 use C4::Output;
 use C4::Print;
@@ -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,15 +49,15 @@ use Date::Calc qw(
 #
 my $query = new CGI;
 
+my $sessionID = $query->cookie("CGISESSID") ;
+my $session = get_session($sessionID);
+
 # 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);
@@ -68,20 +66,15 @@ if ($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 = get_session($sessionID);
-	$session->param('branchprinter',$printer);
-
+    $session->param('branchprinter',$printer);
 }
+
 if (!C4::Context->userenv && !$branch){
-	my $sessionID = $query->cookie("CGISESSID") ;
-	my $session = get_session($sessionID);
-	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;
-	}
+  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 (
@@ -90,47 +83,52 @@ 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 $branches = GetBranches();
 my $printers = GetPrinters();
 
 my @failedrenews = $query->param('failedrenew');
-my @renew_failed;
-for (@failedrenews) { $renew_failed[$_] = 1; } 
+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 (C4::Context->preference("AutoLocation") ne 1) { # FIXME: string comparison to number
+    $template->param(ManualLocation => 1);
+}
 
 my $barcode        = $query->param('barcode') || '';
+$barcode =~  s/^\s*|\s*$//g; # remove leading/trailing whitespace
 
-$barcode = barcodedecode($barcode) if(C4::Context->preference('itemBarcodeInputFilter'));
-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');
+$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 $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;
@@ -141,25 +139,40 @@ my $newexpiry = $query->param('dateexpiry');
 # }
 #
 
-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 ($datedue,$invalidduedate,$globalduedate);
 
-my @datearr = localtime();
+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' ) {
@@ -167,7 +180,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',
@@ -188,9 +200,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'";
@@ -213,40 +234,38 @@ if ($borrowernumber) {
     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 ) =
+    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 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, no issues
         $template->param(
-			flagged => "1",
-            noissues       => "1",
-            expired => 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
-	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 ) ) 
-	{
-		# 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);
-		}
-	}
+    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 ) ) 
+    {
+        # 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,
@@ -258,56 +277,99 @@ if ($borrowernumber) {
 # STEP 3 : ISSUING
 #
 #
-
+my $noerror = 1;
 if ($barcode) {
-	# always check for blockers on issuing
-	my ( $error, $question ) =
-	  CanBookBeIssued( $borrower, $barcode, $datedue , $inprocess );
-	my $noerror    = 1;
-	foreach my $impossible ( keys %$error ) {
+  # 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 ) {
+            if ($impossible eq "NOT_FOR_LOAN_CAN_FORCE"){
+                $$question{$impossible}=$$error{$impossible};
+            } else {
             $template->param(
                 $impossible => $$error{$impossible},
                 IMPOSSIBLE  => 1
             );
+            $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;
+            }
             $noerror = 0;
         }
     
-	if ($issueconfirmed && $noerror) {
-		# we have no blockers for issuing and any issues needing confirmation have been resolved
+  if ($issueconfirmed && $noerror) {
+    # we have no blockers for issuing and any issues needing confirmation have been resolved
         AddIssue( $borrower, $barcode, $datedue, $cancelreserve );
         $inprocess = 1;
     }
-	elsif ($issueconfirmed){
-	}
-    else {
+  elsif ($issueconfirmed){	# FIXME: Do something? Or is this to *intentionally* do nothing?
+    if (C4::Context->preference("AllowNotForLoanOverride")){
+        AddIssue( $borrower, $barcode, $datedue, $cancelreserve );
+        $template->param(IMPOSSIBLE  => 0);
+        $inprocess = 1;
+    }
+  }
+  else {
         my $noquestion = 1;
 #         Get the item title for more information
     	my $getmessageiteminfo  = GetBiblioFromItemNumber(undef,$barcode);
-    
-        foreach my $needsconfirmation ( keys %$question ) {
-            $template->param(
-                $needsconfirmation => $$question{$needsconfirmation},
-                getTitleMessageIteminfo => $getmessageiteminfo->{'title'},
-                NEEDSCONFIRMATION  => 1
-            );
-            $noquestion = 0;
-        }
-        $template->param(
+		if ($noerror) {
+			# only pass needsconfirmation to template if issuing is possible 
+        	foreach my $needsconfirmation ( keys %$question ) {
+        	    $template->param(
+        	        $needsconfirmation => $$question{$needsconfirmation},
+        	        getTitleMessageIteminfo => $getmessageiteminfo->{'title'},
+        	        NEEDSCONFIRMATION  => 1
+        	    );
+        	    $noquestion = 0;
+        	}
+			# Because of the weird conditional structure (empty elsif block),
+			# if we reached here, $issueconfirmed must be false.
+			# Also, since we moved inside the if ($noerror) conditional,
+			# this old chunky conditional can be simplified:
+   		    # if ( $noerror && ( $noquestion || $issueconfirmed ) ) {
+			if ($noquestion) {
+				AddIssue( $borrower, $barcode, $datedue );
+				$inprocess = 1;
+			}
+   	    }
+		$template->param(
 			 itemhomebranch => $getmessageiteminfo->{'homebranch'} ,	             
 			 duedatespec => $duedatespec,
         );
-        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,
-        );
+    # 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.....
 if ($borrowernumber) {
@@ -317,6 +379,8 @@ if ($borrowernumber) {
 ##################################################################################
 # BUILD HTML
 # show all reserves of this borrower, and the position of the reservation ....
+my $borrowercategory;
+my $category_type;
 if ($borrowernumber) {
 
     # new op dev
@@ -343,22 +407,20 @@ if ($borrowernumber) {
         $getreserv{author}         = $getiteminfo->{'author'};
         $getreserv{barcodereserv}  = $getiteminfo->{'barcode'};
         $getreserv{itemcallnumber} = $getiteminfo->{'itemcallnumber'};
-		$getreserv{biblionumber}   = $getiteminfo->{'biblionumber'};
-
+        $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'} );
-        }
-    
+      if($num_res->{'branchcode'} eq $branch){ $getWaitingReserveInfo{waitinghere} = 1; }
         }
         #         check transfers with the itemnumber foud in th reservation loop
         if ($transfertwhen) {
@@ -373,22 +435,21 @@ if ($borrowernumber) {
         {
             $getreserv{nottransfered}   = 1;
             $getreserv{nottransferedby} =
-              GetBranchName( $getiteminfo->{'holdingbranch'} );
+            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{itemtype}        = $itemtypeinfo->{'description'};
             $getreserv{author}          = $getbibinfo->{'author'};
-            $getreserv{itemcallnumber}  = '----------';
-	        $getreserv{biblionumber}    = $num_res->{'biblionumber'};
+            $getreserv{biblionumber}    = $num_res->{'biblionumber'};
         }
+        $getreserv{waitingposition} = $num_res->{'priority'};
         push( @reservloop, \%getreserv );
 
 #         if we have a reserve waiting, initiate waitingreserveloop
@@ -404,6 +465,7 @@ if ($borrowernumber) {
         reservloop  => \@reservloop ,
         WaitingReserveLoop  => \@WaitingReserveLoop,
     );
+    $template->param( adultborrower => 1 ) if ( $borrower->{'category_type'} eq 'A' );
 }
 
 # make the issued books table.
@@ -421,64 +483,51 @@ 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 ($countissues,$issueslist) = GetPendingIssues($borrower->{'borrowernumber'});
+    my ($issueslist) = GetPendingIssues($borrower->{'borrowernumber'});
 
     # split in 2 arrays for today & previous
     foreach my $it ( @$issueslist ) {
         # 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'};
-
-        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'});
-        my $can_renew_error;
-        ($it->{'can_renew'}, $can_renew_error) = CanBookBeRenewed( 
-						$borrower->{'borrowernumber'},$it->{'itemnumber'}
-		);
+        $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'});
-		($restype) and $it->{'can_renew'} = 0;
+        my ( $restype, $reserves ) = CheckReserves( $it->{'itemnumber'} );
+		$it->{'can_renew'} = $can_renew;
+		$it->{'can_confirm'} = !$can_renew && !$restype;
+		$it->{'renew_error'} = $restype;
 
-		$it->{'dd'} = format_date($it->{'date_due'});
-        my $datedue = $it->{'date_due'};
-        $datedue =~ s/-//g;
-		$it->{'od'} = ($datedue < $todaysdate) ? 1 : 0 ;
+        $it->{'dd'} = format_date($it->{'date_due'});
+        $it->{'od'} = ( $it->{'date_due'} lt $todaysdate ) ? 1 : 0 ;
         ($it->{'author'} eq '') and $it->{'author'} = ' ';
-        $it->{'renew_failed'} = $renew_failed[$it->{'itemnumber'}];
+        $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;
         }
     }
-	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;
-	}
-	else {
-		@previousissues = sort { $b->{'date_due' } cmp $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;
     }
 }
 
@@ -494,8 +543,7 @@ FROM issuingrules
   LEFT JOIN itemtypes ON (itemtypes.itemtype=issuingrules.itemtype)
   WHERE categorycode=?
 " );
-#my @issued_itemtypes_count;  # huh?
-$issueqty_sth->execute("*");
+$issueqty_sth->execute("*");	# This is a literal asterisk, not a wildcard.
 
 while ( my $data = $issueqty_sth->fetchrow_hashref() ) {
 
@@ -524,10 +572,7 @@ my %labels;
 my $CGIselectborrower;
 if ($borrowerslist) {
     foreach (
-        sort {
-                lc $a->{'surname'}
-              . lc $a->{'firstname'} cmp lc $b->{'surname'}
-              . lc $b->{'firstname'}
+        sort {(lc $a->{'surname'} cmp lc $b->{'surname'} || lc $a->{'firstname'} cmp lc $b->{'firstname'})
         } @$borrowerslist
       )
     {
@@ -537,10 +582,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
@@ -553,7 +599,7 @@ my $flag;
 
 foreach $flag ( sort keys %$flags ) {
     $template->param( flagged=> 1);
-    $flags->{$flag}->{'message'} =~ s/\n/<br>/g;
+    $flags->{$flag}->{'message'} =~ s#\n#<br />#g;
     if ( $flags->{$flag}->{'noissues'} ) {
         $template->param(
             flagged  => 1,
@@ -571,7 +617,9 @@ foreach $flag ( sort keys %$flags ) {
         if ( $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' ) {
@@ -586,7 +634,8 @@ 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' ) {
@@ -629,31 +678,15 @@ foreach $flag ( sort keys %$flags ) {
 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,
-    );
+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;
 }
 
-$amountold = $temp[1];
 
-my $borrowercategory = GetBorrowercategory( $borrower->{'categorycode'} );
-my $category_type = $borrowercategory->{'category_type'};
-( $template->param( adultborrower => 1 ) ) if ( $category_type eq 'A' );
+$amountold = $temp[1];
 
 $template->param(
     issued_itemtypes_count_loop => $issued_itemtypes_loop,
@@ -661,41 +694,40 @@ $template->param(
     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                      =>
-      $borrower->{'dateexpiry'},    #format_date($borrower->{'dateexpiry'}),
+    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           => $borrower->{'address'},
+    address2          => $borrower->{'address2'},
+    email             => $borrower->{'email'},
+    emailpro          => $borrower->{'emailpro'},
     borrowernotes     => $borrower->{'borrowernotes'},
     city              => $borrower->{'city'},
+    zipcode	          => $borrower->{'zipcode'},
     phone             => $borrower->{'phone'} || $borrower->{'mobile'},
     cardnumber        => $borrower->{'cardnumber'},
     amountold         => $amountold,
     barcode           => $barcode,
     stickyduedate     => $stickyduedate,
+    duedatespec       => $duedatespec,
     message           => $message,
     CGIselectborrower => $CGIselectborrower,
     todayissues       => \@todaysissues,
     previssues        => \@previousissues,
     inprocess         => $inprocess,
-    memberofinstution => $member_of_institution,
-    CGIorganisations  => $CGIorganisations,
-	circview => 1,
-	
+	is_child          => ($borrower->{'category_type'} eq 'C'),
+    circview => 1,
 );
 
-# set return date if stickyduedate
+# save stickyduedate to session
 if ($stickyduedate) {
-    $template->param(
-        duedatespec => $duedatespec,
-    );
+    $session->param( 'stickyduedate', $duedatespec );
 }
 
 #if ($branchcookie) {
@@ -707,8 +739,11 @@ $template->param( picture => 1 ) if $picture;
 
 
 $template->param(
-    SpecifyDueDate           => C4::Context->preference("SpecifyDueDate"),
-    CircAutocompl            => C4::Context->preference("CircAutocompl") ,
-    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
+    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(),
 );
 output_html_with_http_headers $query, $cookie, $template->output;