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

(-)a/C4/Circulation.pm (-6 / +8 lines)
Lines 1973-1983 sub AddReturn { Link Here
1973
                MarkIssueReturned( $borrowernumber, $item->itemnumber, $return_date, $patron->privacy );
1973
                MarkIssueReturned( $borrowernumber, $item->itemnumber, $return_date, $patron->privacy );
1974
            };
1974
            };
1975
            unless ( $@ ) {
1975
            unless ( $@ ) {
1976
                my $calc_fine = C4::Context->preference('CalculateFinesOnReturn');
1976
                if (
1977
                $calc_fine ||= $return_date_specified && C4::Context->preference('CalculateFinesOnBackdate');
1977
                    (
1978
                $calc_fine &&= !$item->itemlost;
1978
                        C4::Context->preference('CalculateFinesOnReturn')
1979
1979
                        || ( $return_date_specified && C4::Context->preference('CalculateFinesOnBackdate') )
1980
                if ( $calc_fine ) {
1980
                    )
1981
                    && !$item->itemlost
1982
                  )
1983
                {
1981
                    _CalculateAndUpdateFine( { issue => $issue, item => $item->unblessed, borrower => $patron_unblessed, return_date => $return_date } );
1984
                    _CalculateAndUpdateFine( { issue => $issue, item => $item->unblessed, borrower => $patron_unblessed, return_date => $return_date } );
1982
                }
1985
                }
1983
            } else {
1986
            } else {
1984
- 

Return to bug 24380