X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=C4%2FOverdues.pm;h=ac66c365b95a972218a5bdaceb99c8d85e6466a8;hb=d03c8443a4c5a4549a3ee37df201f031b40b2f41;hp=d17f4452ef6e4a100705f8e419992a7bd9d1b958;hpb=913aba1a6639e00535cdb631ed2ca80cbe80289f;p=koha_fer diff --git a/C4/Overdues.pm b/C4/Overdues.pm index d17f4452ef..ac66c365b9 100644 --- a/C4/Overdues.pm +++ b/C4/Overdues.pm @@ -263,10 +263,10 @@ sub CalcFine { my $chargeable_units = _get_chargeable_units($fine_unit, $start_date, $end_date, $branchcode); my $units_minus_grace = $chargeable_units - $data->{firstremind}; my $amount = 0; - if ($data->{'chargeperiod'} && $units_minus_grace ) { + if ($data->{'chargeperiod'} && ($units_minus_grace > 0) ) { $amount = int($chargeable_units / $data->{'chargeperiod'}) * $data->{'fine'};# TODO fine calc should be in cents } else { - # a zero (or null) chargeperiod means no charge. + # a zero (or null) chargeperiod or negative units_minus_grace value means no charge. } $amount = $data->{overduefinescap} if $data->{overduefinescap} && $amount > $data->{overduefinescap}; $debug and warn sprintf("CalcFine returning (%s, %s, %s, %s)", $amount, $data->{'chargename'}, $units_minus_grace, $chargeable_units);