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

[LAURIN arnaud]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	LAURIN arnaud <alaurin>	06/12/19 16:48:17

Modified files:
	C4             : Context.pm Koha.pm Reserves2.pm 

Log message:
	reident programs, and adding branchcode value in reserves2

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Context.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.43.2.7&r2=1.43.2.8
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Koha.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.40.2.28&r2=1.40.2.29
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Reserves2.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.46.2.10&r2=1.46.2.11

Patches:
Index: Context.pm
===================================================================
RCS file: /sources/koha/koha/C4/Context.pm,v
retrieving revision 1.43.2.7
retrieving revision 1.43.2.8
diff -u -b -r1.43.2.7 -r1.43.2.8
--- Context.pm	6 Dec 2006 21:55:38 -0000	1.43.2.7
+++ Context.pm	19 Dec 2006 16:48:16 -0000	1.43.2.8
@@ -16,7 +16,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: Context.pm,v 1.43.2.7 2006/12/06 21:55:38 hdl Exp $
+# $Id: Context.pm,v 1.43.2.8 2006/12/19 16:48:16 alaurin Exp $
 use strict;
 use DBI;
 use ZOOM;
@@ -28,7 +28,7 @@
     qw($context),
     qw(@context_stack);
 
-$VERSION = do { my @v = '$Revision: 1.43.2.7 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.43.2.8 $' =~ /\d+/g;
         shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
 
 =head1 NAME
@@ -857,6 +857,9 @@
 =cut
 
 # $Log: Context.pm,v $
+# Revision 1.43.2.8  2006/12/19 16:48:16  alaurin
+# reident programs, and adding branchcode value in reserves2
+#
 # Revision 1.43.2.7  2006/12/06 21:55:38  hdl
 # Adding zebraoptions for servers to get serverinfos in Context.pm
 # Using this function in rebuild_zebra.pl

Index: Koha.pm
===================================================================
RCS file: /sources/koha/koha/C4/Koha.pm,v
retrieving revision 1.40.2.28
retrieving revision 1.40.2.29
diff -u -b -r1.40.2.28 -r1.40.2.29
--- Koha.pm	14 Dec 2006 15:41:53 -0000	1.40.2.28
+++ Koha.pm	19 Dec 2006 16:48:16 -0000	1.40.2.29
@@ -17,7 +17,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: Koha.pm,v 1.40.2.28 2006/12/14 15:41:53 toins Exp $
+# $Id: Koha.pm,v 1.40.2.29 2006/12/19 16:48:16 alaurin Exp $
 
 use strict;
 require Exporter;
@@ -25,7 +25,7 @@
 use C4::Output;
 use vars qw($VERSION @ISA @EXPORT);
 
-$VERSION = do { my @v = '$Revision: 1.40.2.28 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.40.2.29 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
@@ -984,7 +984,6 @@
         { value => 'ti',     label => 'Title' },
         { value => 'ti,phr', label => '&nbsp;&nbsp;&nbsp;&nbsp; Title Phrase' },
         { value => 'se',     label => '&nbsp;&nbsp;&nbsp;&nbsp; Series Title' },
-
     ];
     return $indexes;
 }

Index: Reserves2.pm
===================================================================
RCS file: /sources/koha/koha/C4/Reserves2.pm,v
retrieving revision 1.46.2.10
retrieving revision 1.46.2.11
diff -u -b -r1.46.2.10 -r1.46.2.11
--- Reserves2.pm	7 Dec 2006 15:42:14 -0000	1.46.2.10
+++ Reserves2.pm	19 Dec 2006 16:48:17 -0000	1.46.2.11
@@ -20,7 +20,7 @@
 # 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.10 2006/12/07 15:42:14 toins Exp $
+# $Id: Reserves2.pm,v 1.46.2.11 2006/12/19 16:48:17 alaurin Exp $
 
 use strict;
 require Exporter;
@@ -32,7 +32,7 @@
 my $library_name = C4::Context->preference("LibraryName");
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.46.2.10 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.46.2.11 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
@@ -120,7 +120,6 @@
         my $iteminfo = C4::Circulation::Circ2::getiteminformation($itemnumber,undef);
         if ( $iteminfo->{'holdingbranch'} ne $checkreserves->{'branchcode'} ) {
             $messages->{'transfert'} = $checkreserves->{'branchcode'};
-
             #minus priorities of others reservs
             MinusPriority(
                 $itemnumber,
@@ -458,7 +457,8 @@
 
     my $query = '
         SELECT reservedate,
-        borrowernumber
+        borrowernumber,
+        branchcode
         FROM   reserves
         WHERE  itemnumber = ?
           AND  cancellationdate IS NULL