X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=circ%2Freturns.pl;h=6daddc4c545a02fbf7b52912030f896f5b2ec607;hb=b16336caf8132d73ae71d78b4efe38df56029b81;hp=895823f40a6bc4a962dc8eefbe353a6dd09d8263;hpb=1b618cac3dc1436ba38c78ea5219afc6822f5f5a;p=koha_fer

diff --git a/circ/returns.pl b/circ/returns.pl
index 895823f40a..6daddc4c54 100755
--- a/circ/returns.pl
+++ b/circ/returns.pl
@@ -192,8 +192,11 @@ my $return_date_override_remember =
   $query->param('return_date_override_remember');
 if ($return_date_override) {
     if ( C4::Context->preference('SpecifyReturnDate') ) {
+        # FIXME we really need to stop adding more uses of C4::Dates
         if ( $return_date_override =~ C4::Dates->regexp('syspref') ) {
 
+            # note that we've overriden the return date
+            $template->param( return_date_was_overriden => 1);
             # Save the original format if we are remembering for this series
             $template->param(
                 return_date_override          => $return_date_override,
@@ -274,7 +277,8 @@ if ($barcode) {
         itemtype         => $biblio->{'itemtype'},
         ccode            => $biblio->{'ccode'},
         itembiblionumber => $biblio->{'biblionumber'},    
-	additional_materials => $biblio->{'materials'}
+        borrower         => $borrower,
+        additional_materials => $biblio->{'materials'},
     );
 
     my %input = (
@@ -497,6 +501,9 @@ foreach my $code ( keys %$messages ) {
         $err{debarborrowernumber} = $borrower->{borrowernumber};
         $err{debarname}           = "$borrower->{firstname} $borrower->{surname}";
     }
+    elsif ( $code eq 'PrevDebarred' ) {
+        $err{prevdebarred}        = $messages->{'PrevDebarred'};
+    }
     else {
         die "Unknown error code $code";    # note we need all the (empty) elsif's above, or we die.
         # This forces the issue of staying in sync w/ Circulation.pm