changed the way Waiting items are transfered from returns.pl to Circ2.pm

diff --git a/C4/Circulation/Circ2.pm b/C4/Circulation/Circ2.pm
index b0349c5..bab5296 100755 (executable)
--- a/C4/Circulation/Circ2.pm
+++ b/C4/Circulation/Circ2.pm
@@ -527,7 +527,7 @@ sub returnbook {
     }
     ($borrower) = getpatroninformation(\%env, $currentborrower, 0);
 # transfer book
-    my ($transfered, $mess, $item) = transferbook($branch, $barcode);
+    my ($transfered, $mess, $item) = transferbook($branch, $barcode, 1);
     if ($transfered) {
        $messages->{'WasTransfered'};
     }

diff --git a/circ/returns.pl b/circ/returns.pl
index bd16853..4463d51 100755 (executable)
--- a/circ/returns.pl
+++ b/circ/returns.pl
@@ -210,8 +210,6 @@ if ($messages->{'ResFound'}) {
     my ($iteminfo) = getiteminformation(\%env, 0, $barcode);
 
     if ($res->{'ResFound'} eq "Waiting") {
-# transfer book
-       my ($transfered, $mess, $item) = transferbook($branch, $barcode, 1);
        $reservetext = <<"EOF";
 <font color='red' size='+2'>Item marked Waiting:</font><br>
     Item $iteminfo->{'title'} ($iteminfo->{'author'}) <br>