Reintroducing overdue filters.

[koha_fer] / circ / returns.pl

diff --git a/circ/returns.pl b/circ/returns.pl
index f0a9beb..31ff40f 100755 (executable)
--- a/circ/returns.pl
+++ b/circ/returns.pl
@@ -1,6 +1,8 @@
 #!/usr/bin/perl
 
 # Copyright 2000-2002 Katipo Communications
+#           2006 SAN-OP
+#           2007 BibLibre, Paul POULAIN
 #
 # This file is part of Koha.
 #
@@ -21,24 +23,21 @@
 
 script to execute returns of books
 
-written 11/3/2002 by Finlay
-
 =cut
 
 use strict;
 use CGI;
+use C4::Context;
+use C4::Auth;
+use C4::Output;
 use C4::Circulation;
 use C4::Date;
-use C4::Output;
 use C4::Print;
 use C4::Reserves;
-use C4::Auth;
 use C4::Biblio;
 use C4::Members;
-use C4::Interface::CGI::Output;
 use C4::Branch; # GetBranchName
 use C4::Koha;   # FIXME : is it still useful ?
-use C4::Context;
 
 my $query = new CGI;
 
@@ -104,7 +103,6 @@ if ($query->param('WT-itemNumber')){
 updateWrongTransfer ($query->param('WT-itemNumber'),$query->param('WT-waitingAt'),$query->param('WT-From'));
 }
 
-
 if ( $query->param('resbarcode') ) {
     my $item           = $query->param('itemnumber');
     my $borrowernumber = $query->param('borrowernumber');
@@ -114,18 +112,17 @@ if ( $query->param('resbarcode') ) {
     my $iteminfo   = GetBiblioFromItemNumber($item);
     my $diffBranchSend;
     
-#     addin in ReserveWaiting the possibility to check if the document is expected in this library or not,
+#     addin in ModReserveAffect the possibility to check if the document is expected in this library or not,
 # if not we send a value in reserve waiting for not implementting waiting status
-       if ($diffBranchReturned) {
-       $diffBranchSend = $diffBranchReturned;
-       }
-       else {
-       $diffBranchSend = undef;
-       }
-                
-    my $tobranchcd = ReserveWaiting( $item, $borrowernumber,$diffBranchSend);
+    if ($diffBranchReturned) {
+        $diffBranchSend = $diffBranchReturned;
+    }
+    else {
+        $diffBranchSend = undef;
+    }
+    ModReserveAffect( $item, $borrowernumber,$diffBranchSend);
 #   check if we have other reservs for this document, if we have a return send the message of transfer
-    my ( $messages, $nextreservinfo ) = OtherReserves($item);
+    my ( $messages, $nextreservinfo ) = GetOtherReserves($item);
 
     my $branchname = GetBranchName( $messages->{'transfert'} );
     my ($borr) = GetMemberDetails( $nextreservinfo, 0 );
@@ -295,6 +292,7 @@ if ( $messages->{'ResFound'} and not $messages->{'WrongTransfer'}) {
             gonenoaddress  => $borr->{'gonenoaddress'},
             currentbranch  => $branches->{C4::Context->userenv->{'branch'}}->{'branchname'},
             itemnumber       => $reserve->{'itemnumber'},
+            barcode     => $barcode,
         );
 
     }
@@ -320,6 +318,7 @@ if ( $messages->{'ResFound'} and not $messages->{'WrongTransfer'}) {
             destbranch    => $reserve->{'branchcode'},
             transfertodo => ( C4::Context->userenv->{'branch'} eq $reserve->{'branchcode'} ? 0 : 1 ),
             reserved => 1,
+            resbarcode       => $barcode,
             today            => $todaysdate,
             itemnumber       => $reserve->{'itemnumber'},
             borsurname       => $borr->{'surname'},