[Koha-cvs] koha/admin issuingrules.pl [rel_2_2]

[Chris Cormack]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_2_2
Changes by:     Chris Cormack <rangi>   07/07/08 10:21:24

Modified files:
        admin          : issuingrules.pl 

Log message:
        Fix for bug 1374

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/admin/issuingrules.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.3.2.7&r2=1.3.2.8

Patches:
Index: issuingrules.pl
===================================================================
RCS file: /sources/koha/koha/admin/issuingrules.pl,v
retrieving revision 1.3.2.7
retrieving revision 1.3.2.8
diff -u -b -r1.3.2.7 -r1.3.2.8
--- issuingrules.pl     12 Feb 2007 21:42:22 -0000      1.3.2.7
+++ issuingrules.pl     8 Jul 2007 10:21:24 -0000       1.3.2.8
@@ -157,17 +157,14 @@
                $sth2->finish;
                my $fine= sprintf("%.2f",$dat->{'fine'});
                my $maxissueqty = $dat->{'maxissueqty'};
+               $maxissueqty = 5 unless $maxissueqty > 0;
                my $issuelength = $dat->{'issuelength'};
                my $finesvalue;
                $finesvalue= 
"$fine,$dat->{'firstremind'},$dat->{'chargeperiod'}" unless ($dat->{'fine'} eq 
undef);
                my $issuingvalue;
-#              if ($maxissueqty>0) {
-                   $issuingvalue = "$issuelength,$maxissueqty" unless 
($dat->{'maxissueqty'} eq undef or $dat->{'maxissueqty'} eq undef);
-#              }
-#              else {          
-#                  $issuingvalue = "$issuelength, 5";
-#                  $maxissueqty = 5;
-#              }
+               if ($maxissueqty and $issuelength) {
+                   $issuingvalue = "$issuelength,$maxissueqty";
+               }
                my %row = (finesname=> 
"F-$branch-$trow3[$i].$$data->{'itemtype'}",
                                        finesvalue => $finesvalue,
                                        issuingname => 
"I-$branch-$trow3[$i].$$data->{itemtype}",