[Koha-cvs] koha/circ branchtransfers.pl circulation.pl res... [rel_2_2]

[Henri-Damien LAURENT]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_2_2
Changes by:     Henri-Damien LAURENT <hdl>      07/04/26 14:10:42

Modified files:
        circ           : branchtransfers.pl circulation.pl reserve.pl 

Log message:
        selected branch now prints selected to select branch branch by default.
        Using POSIX::strftime to have localtime for reserves.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/circ/branchtransfers.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.20.4.8&r2=1.20.4.9
http://cvs.savannah.gnu.org/viewcvs/koha/circ/circulation.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.81.2.20&r2=1.81.2.21
http://cvs.savannah.gnu.org/viewcvs/koha/circ/reserve.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.7&r2=1.1.2.8

Patches:
Index: branchtransfers.pl
===================================================================
RCS file: /sources/koha/koha/circ/branchtransfers.pl,v
retrieving revision 1.20.4.8
retrieving revision 1.20.4.9
diff -u -b -r1.20.4.8 -r1.20.4.9
--- branchtransfers.pl  2 Mar 2006 22:50:53 -0000       1.20.4.8
+++ branchtransfers.pl  26 Apr 2007 14:10:42 -0000      1.20.4.9
@@ -106,7 +106,7 @@
 foreach my $br (keys %$branches) {
     #(next) unless $branches->{$br}->{'CU'}; #FIXME disabled to fix bug 202
     my %branch;
-    $branch{selected}=($br eq $tobranchcd);
+    $branch{selected}=(($br eq $tobranchcd)?"selected":"");
        $branch{code}=$br;
        $branch{name}=$branches->{$br}->{'branchname'};
        push (@branchoptionloop, \%branch);

Index: circulation.pl
===================================================================
RCS file: /sources/koha/koha/circ/circulation.pl,v
retrieving revision 1.81.2.20
retrieving revision 1.81.2.21
diff -u -b -r1.81.2.20 -r1.81.2.21
--- circulation.pl      3 Feb 2007 08:37:14 -0000       1.81.2.20
+++ circulation.pl      26 Apr 2007 14:10:42 -0000      1.81.2.21
@@ -35,6 +35,7 @@
 use C4::Koha;
 use HTML::Template;
 use C4::Date;
+use Date::Calc;
 use Date::Manip;
 
 #
@@ -83,9 +84,12 @@
 $env{'printer'}=$printer;
 $env{'queue'}=$printer;
 
-my @datearr = localtime(time());
-# FIXME - Could just use POSIX::strftime("%Y%m%d", localtime);
-my $todaysdate = (1900+$datearr[5]).sprintf ("%0.2d", ($datearr[4]+1)).sprintf 
("%0.2d", ($datearr[3]));
+# my @datearr = localtime(time());
+# FIXED - Could just use POSIX::strftime("%Y%m%d", localtime);
+my $todaysdate = POSIX::strftime("%Y%m%d", localtime);
+# (1900+$datearr[5]).sprintf ("%0.2d", ($datearr[4]+1)).sprintf ("%0.2d", 
($datearr[3]));
+
+
 # check and see if we should print
  if ($barcode eq ''  && $print eq 'maybe'){
        $print = 'yes';

Index: reserve.pl
===================================================================
RCS file: /sources/koha/koha/circ/Attic/reserve.pl,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -b -r1.1.2.7 -r1.1.2.8
--- reserve.pl  11 May 2006 11:31:23 -0000      1.1.2.7
+++ reserve.pl  26 Apr 2007 14:10:42 -0000      1.1.2.8
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: reserve.pl,v 1.1.2.7 2006/05/11 11:31:23 rangi Exp $
+# $Id: reserve.pl,v 1.1.2.8 2007/04/26 14:10:42 hdl Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -66,8 +66,8 @@
 my $biblionumber;
 my $title;
 my $author;
-my @datearr = localtime(time());
-my $todaysdate = (1900+$datearr[5]).'-'.sprintf ("%0.2d", 
($datearr[4]+1)).'-'.sprintf ("%0.2d", $datearr[3]);
+# my @datearr = localtime(time());
+my $todaysdate = POSIX::strftime("%Y-%m-%d", localtime);;
 
 my $dbh = C4::Context->dbh;
 my $strsth="select reservedate,reserves.borrowernumber as bornum, 
concat(firstname,' ',surname) as borrower, borrowers.phone, 
borrowers.emailaddress,reserves.biblionumber, reserves.branchcode as branch, 
items.holdingbranch, items.itemcallnumber, items.itemnumber, notes, 
notificationdate, reminderdate, priority, reserves.found, biblio.title, 
biblio.author from reserves left join items on 
items.itemnumber=reserves.itemnumber, borrowers,biblio where 
isnull(cancellationdate) && reserves.borrowernumber=borrowers.borrowernumber && 
reserves.biblionumber=biblio.biblionumber order by reservedate, borrower ";