[Koha-cvs] koha/C4/Circulation Circ2.pm [rel_2_2]

[Waylon Robertson]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_2_2
Changes by:     Waylon Robertson <genji>        07/01/28 01:29:31

Modified files:
        C4/Circulation : Circ2.pm 

Log message:
        Bug 1201 fixed by changing transferbook. Books will no longer be 
returned by transferbook. Thus, breaking the loop. Transfer book should be used 
when transfering books from branch to branch. if a book is returned at a 
branch, transfer the book there. if a book is transfered to a branch, while its 
on loan, set holding to the new branch. Useful if a borrower moves branches, 
while borrowing books.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Circulation/Circ2.pm?cvsroot=koha&only_with_tag=rel_2_2&r1=1.87.2.18&r2=1.87.2.19

Patches:
Index: Circ2.pm
===================================================================
RCS file: /sources/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.87.2.18
retrieving revision 1.87.2.19
diff -u -b -r1.87.2.18 -r1.87.2.19
--- Circ2.pm    28 Jan 2007 00:29:25 -0000      1.87.2.18
+++ Circ2.pm    28 Jan 2007 01:29:28 -0000      1.87.2.19
@@ -3,7 +3,7 @@
 
 package C4::Circulation::Circ2;
 
-# $Id: Circ2.pm,v 1.87.2.18 2007/01/28 00:29:25 genji Exp $
+# $Id: Circ2.pm,v 1.87.2.19 2007/01/28 01:29:28 genji Exp $
 
 #package to deal with Returns
 #written 3/11/99 by address@hidden
@@ -428,7 +428,7 @@
 #'
 # FIXME - This function tries to do too much, and its API is clumsy.
 # If it didn't also return books, it could be used to change the home
-# branch of a book while the book is on loan.
+# branch of a book while the book is on loan. - Your idea, my fix.
 #
 # Is there any point in returning the item information? The caller can
 # look that up elsewhere if ve cares.
@@ -466,12 +466,15 @@
                $messages->{'DestinationEqualsHolding'} = 1;
                $dotransfer = 0;
        }
-       # check if it is still issued to someone, return it...
-       my ($currentborrower) = 
currentborrower($iteminformation->{'itemnumber'});
-       if ($currentborrower) {
-               returnbook($barcode, $fbr);
-               $messages->{'WasReturned'} = $currentborrower;
-       }
+       # Depreciated - check if it is still issued to someone, return it...
+    # returnbook here, sends it into a loop. And, by doing this, it enables
+    # this sub to be used to transfer books between branches while the book is
+    # on loan.
+#      my ($currentborrower) = 
currentborrower($iteminformation->{'itemnumber'});
+#      if ($currentborrower) {
+#              returnbook($barcode, $fbr);
+#              $messages->{'WasReturned'} = $currentborrower;
+#      }
        # find reserves.....
        # FIXME - Don't call &CheckReserves unless $ignoreRs is true.
        # That'll save a database query.