[Koha-cvs] koha/opac opac-reserve.pl [rel_3_0]

[Antoine Farnault]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     Antoine Farnault <toins>        07/01/09 08:37:17

Modified files:
        opac           : opac-reserve.pl 

Log message:
        sync with dev_week ( Fix for bug #1190: Reservation fee is charged even 
when it's not specified in the borrower rules )

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-reserve.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.29.2.9&r2=1.29.2.10

Patches:
Index: opac-reserve.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-reserve.pl,v
retrieving revision 1.29.2.9
retrieving revision 1.29.2.10
diff -u -b -r1.29.2.9 -r1.29.2.10
--- opac-reserve.pl     19 Dec 2006 15:04:04 -0000      1.29.2.9
+++ opac-reserve.pl     9 Jan 2007 08:37:17 -0000       1.29.2.10
@@ -45,9 +45,6 @@
 # get borrower information ....
 my ( $borr, $flags ) = getpatroninformation( undef, $borrowernumber );
 
-# my @bordat;
-# $bordat[0] = $borr;
-
 # get biblionumber.....
 my $biblionumber = $query->param('biblionumber');
 
@@ -81,7 +78,6 @@
 $template->param( branchname => $branches->{$branch}->{'branchname'} );
 
 # make branch selection options...
-#my $branchoptions = '';
 my @branches;
 my @select_branch;
 my %select_branches;
@@ -227,12 +223,16 @@
     }
     elsif ( $query->param('all') ) {
         $template->param( all => 1 );
-        $fee     = 1;
+        # No idea why fee would be set to 1 ... it's supposed to be a monetary 
value, not a flag
+               # -- JF
+               #$fee = 1;
         $proceed = 1;
     }
     if ( $proceed && $branch ) {
         $fee = sprintf "%.02f", $fee;
+               if ($fee > 1) {
         $template->param( fee => $fee, istherefee => $fee > 0 ? 1 : 0 );
+               }
         $template->param( item_types_selected => 1 );
         $template->param( no_branch_selected => 1 ) unless ( $branch != '' );
     }