[Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.90,1.91

[Paul POULAIN]

Update of /cvsroot/koha/koha/C4/Circulation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29180/C4/Circulation

Modified Files:
        Circ2.pm 
Log Message:
synch'ing 2.2 and head

Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -r1.90 -r1.91
*** Circ2.pm    3 May 2005 19:39:20 -0000       1.90
--- Circ2.pm    4 May 2005 15:39:07 -0000       1.91
***************
*** 859,864 ****
                                        warn "CancelReserve 
$res->{'itemnumber'}, $res->{'borrowernumber'}";
                                } else {
!                                       my $tobrcd = 
ReserveWaiting($res->{'itemnumber'}, $res->{'borrowernumber'});
!                                       transferbook($tobrcd,$barcode, 1);
                                        warn "transferbook";
                                }
--- 859,864 ----
                                        warn "CancelReserve 
$res->{'itemnumber'}, $res->{'borrowernumber'}";
                                } else {
! #                                     my $tobrcd = 
ReserveWaiting($res->{'itemnumber'}, $res->{'borrowernumber'});
! #                                     transferbook($tobrcd,$barcode, 1);
                                        warn "transferbook";
                                }