circ subdir - Dates.pm integration and warnings fixes.

[koha.git] / circ / returns.pl

diff --git a/circ/returns.pl b/circ/returns.pl
index d7ace40..e37c97a 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::Circulation;
-use C4::Date;
+use C4::Context;
+use C4::Auth;
 use C4::Output;
+use C4::Circulation;
+use C4::Dates;
 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 );
@@ -138,6 +135,7 @@ if ( $query->param('resbarcode') ) {
     if ( $messages->{'transfert'} ) {
         $template->param(
             itemtitle      => $iteminfo->{'title'},
+                       itembiblionumber => $iteminfo->{'biblionumber'},
             iteminfo       => $iteminfo->{'author'},
             tobranchname   => $branchname,
             name           => $name,
@@ -252,8 +250,9 @@ if ( $messages->{'WrongTransfer'} and not $messages->{'WasTransfered'}) {
             wborsurname     => $borr->{'surname'},
             wbortitle       => $borr->{'title'},
             wborphone       => $borr->{'phone'},
-            wboremail       => $borr->{'emailaddress'},
-            wborstraddress  => $borr->{'streetaddress'},
+            wboremail       => $borr->{'email'},
+            wboraddress  => $borr->{'address'},
+            wboraddress2 => $borr->{'address2'},
             wborcity        => $borr->{'city'},
             wborzip         => $borr->{'zipcode'},
             wborrowernumber => $reserve->{'borrowernumber'},
@@ -285,8 +284,9 @@ if ( $messages->{'ResFound'} and not $messages->{'WrongTransfer'}) {
             borsurname     => $borr->{'surname'},
             bortitle       => $borr->{'title'},
             borphone       => $borr->{'phone'},
-            boremail       => $borr->{'emailaddress'},
-            borstraddress  => $borr->{'streetaddress'},
+            boremail       => $borr->{'email'},
+            boraddress  => $borr->{'address'},
+            boraddress2  => $borr->{'address2'},
             borcity        => $borr->{'city'},
             borzip         => $borr->{'zipcode'},
             borrowernumber => $reserve->{'borrowernumber'},
@@ -295,6 +295,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 +321,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'},
@@ -328,11 +330,12 @@ if ( $messages->{'ResFound'} and not $messages->{'WrongTransfer'}) {
             borrowernumber   => $reserve->{'borrowernumber'},
             borcnum          => $borr->{'cardnumber'},
             borphone         => $borr->{'phone'},
-            borstraddress    => $borr->{'streetaddress'},
+            boraddress    => $borr->{'address'},
+            boraddress2    => $borr->{'address2'},
             borsub           => $borr->{'suburb'},
             borcity          => $borr->{'city'},
             borzip           => $borr->{'zipcode'},
-            boremail         => $borr->{'emailaddress'},
+            boremail         => $borr->{'email'},
             debarred         => $borr->{'debarred'},
             gonenoaddress    => $borr->{'gonenoaddress'},
             barcode          => $barcode
@@ -523,24 +526,7 @@ $template->param(
     branchname              => $branches->{C4::Context->userenv->{'branch'}}->{'branchname'},
     printer                 => $printer,
     errmsgloop              => \@errmsgloop,
-    intranetcolorstylesheet =>
-      C4::Context->preference("intranetcolorstylesheet"),
-    intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-    IntranetNav        => C4::Context->preference("IntranetNav"),
 );
 
 # actually print the page!
 output_html_with_http_headers $query, $cookie, $template->output;
-
-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;
-    }
-}