[Koha-cvs] koha/C4 Reserves2.pm [rel_3_0]

[LAURIN arnaud]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     LAURIN arnaud <alaurin> 07/01/24 11:16:42

Modified files:
        C4             : Reserves2.pm 

Log message:
        bugfixing and improvements for request :
        
                - bug fix for queue list rank management
                - Two distinct calls for queue list of reservations and 
globality of reservation of this biblionumber (now the security of a single 
possibility of reservation for a biblionumber now working ....)
                - No possibility to change the order of reservation (maybe 
managed a possibility to switch by a system preference to change order of 
reservtion ....)
                -adding the expected place of retreat for the reserve on the 
item reservation line ...
        
        some improvements will be commit soon, working on it .....

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Reserves2.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.46.2.13&r2=1.46.2.14

Patches:
Index: Reserves2.pm
===================================================================
RCS file: /sources/koha/koha/C4/Reserves2.pm,v
retrieving revision 1.46.2.13
retrieving revision 1.46.2.14
diff -u -b -r1.46.2.13 -r1.46.2.14
--- Reserves2.pm        22 Jan 2007 18:00:39 -0000      1.46.2.13
+++ Reserves2.pm        24 Jan 2007 11:16:42 -0000      1.46.2.14
@@ -20,18 +20,20 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: Reserves2.pm,v 1.46.2.13 2007/01/22 18:00:39 alaurin Exp $
+# $Id: Reserves2.pm,v 1.46.2.14 2007/01/24 11:16:42 alaurin Exp $
 
 use strict;
 require Exporter;
 use C4::Context;
 use C4::Biblio;
 use C4::Search;
+use C4::Circulation::Circ2;
+
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 my $library_name = C4::Context->preference("LibraryName");
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.46.2.13 $' =~ /\d+/g; shift(@v) . "." . 
join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.46.2.14 $' =~ /\d+/g; shift(@v) . "." . 
join( "_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
@@ -468,7 +470,7 @@
     $sth->execute($itemnumber);
     my $row = $sth->fetchrow_hashref;
 
-    return ($row->{reservedate},$row->{borrowernumber});
+    return ($row->{reservedate},$row->{borrowernumber},$row->{branchcode});
 }
 
 
#-------------------------------------------------------------------------------------
@@ -736,9 +738,9 @@
     my ( $biblio, $borrowernumber, $rank ) = @_;
     my $dbh = C4::Context->dbh;
 
-#     if ( $rank eq "del" ) {
-#         CancelReserve( $biblio, undef, $borrowernumber );
-#     }
+     if ( $rank eq "del" ) {
+         CancelReserve( $biblio, undef, $borrowernumber );
+     }
     if ( $rank eq "W" || $rank eq "0" ) {
 
         # make sure priority for waiting items is 0