View | Details | Raw Unified | Return to bug 34279
Collapse All | Expand All

(-)a/C4/Overdues.pm (-1 / +4 lines)
Lines 282-288 sub CalcFine { Link Here
282
        }
282
        }
283
    } # else { # a zero (or null) chargeperiod or negative units_minus_grace value means no charge. }
283
    } # else { # a zero (or null) chargeperiod or negative units_minus_grace value means no charge. }
284
284
285
    $amount = $issuing_rule->{overduefinescap} if $issuing_rule->{overduefinescap} && $amount > $issuing_rule->{overduefinescap};
285
    $amount = $issuing_rule->{overduefinescap}
286
        if $issuing_rule->{overduefinescap}
287
        && $issuing_rule->{overduefinescap} > 0
288
        && $amount > $issuing_rule->{overduefinescap};
286
289
287
    # This must be moved to Koha::Item (see also similar code in C4::Accounts::chargelostitem
290
    # This must be moved to Koha::Item (see also similar code in C4::Accounts::chargelostitem
288
    $item->{replacementprice} ||= $itemtype->defaultreplacecost
291
    $item->{replacementprice} ||= $itemtype->defaultreplacecost
(-)a/t/db_dependent/Circulation/CalcFine.t (-13 / +13 lines)
Lines 122-136 subtest 'Overdue fines cap should be disabled when value is 0' => sub { Link Here
122
    );
122
    );
123
123
124
    my $start_dt = DateTime->new(
124
    my $start_dt = DateTime->new(
125
        year       => 2000,
125
        year  => 2000,
126
        month      => 1,
126
        month => 1,
127
        day        => 1,
127
        day   => 1,
128
    );
128
    );
129
129
130
    my $end_dt = DateTime->new(
130
    my $end_dt = DateTime->new(
131
        year       => 2000,
131
        year  => 2000,
132
        month      => 1,
132
        month => 1,
133
        day        => 30,
133
        day   => 30,
134
    );
134
    );
135
135
136
    my ($amount) = CalcFine( $item->unblessed, $patron->{categorycode}, $branch->{branchcode}, $start_dt, $end_dt );
136
    my ($amount) = CalcFine( $item->unblessed, $patron->{categorycode}, $branch->{branchcode}, $start_dt, $end_dt );
Lines 161-175 subtest 'Overdue fines cap should be disabled when value is 0.00' => sub { Link Here
161
    );
161
    );
162
162
163
    my $start_dt = DateTime->new(
163
    my $start_dt = DateTime->new(
164
        year       => 2000,
164
        year  => 2000,
165
        month      => 1,
165
        month => 1,
166
        day        => 1,
166
        day   => 1,
167
    );
167
    );
168
168
169
    my $end_dt = DateTime->new(
169
    my $end_dt = DateTime->new(
170
        year       => 2000,
170
        year  => 2000,
171
        month      => 1,
171
        month => 1,
172
        day        => 30,
172
        day   => 30,
173
    );
173
    );
174
174
175
    my ($amount) = CalcFine( $item->unblessed, $patron->{categorycode}, $branch->{branchcode}, $start_dt, $end_dt );
175
    my ($amount) = CalcFine( $item->unblessed, $patron->{categorycode}, $branch->{branchcode}, $start_dt, $end_dt );
Lines 179-184 subtest 'Overdue fines cap should be disabled when value is 0.00' => sub { Link Here
179
    teardown();
179
    teardown();
180
};
180
};
181
181
182
182
subtest 'Test with fine amount empty' => sub {
183
subtest 'Test with fine amount empty' => sub {
183
    plan tests => 1;
184
    plan tests => 1;
184
185
185
- 

Return to bug 34279