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

(-)a/C4/Circulation.pm (-2 / +2 lines)
Lines 1858-1863 sub AddReturn { Link Here
1858
        undef $branch;
1858
        undef $branch;
1859
    }
1859
    }
1860
    $branch = C4::Context->userenv->{'branch'} unless $branch;  # we trust userenv to be a safe fallback/default
1860
    $branch = C4::Context->userenv->{'branch'} unless $branch;  # we trust userenv to be a safe fallback/default
1861
    my $return_date_specified = !!$return_date;
1861
    $return_date //= dt_from_string();
1862
    $return_date //= dt_from_string();
1862
    my $messages;
1863
    my $messages;
1863
    my $patron;
1864
    my $patron;
Lines 1975-1981 sub AddReturn { Link Here
1975
                MarkIssueReturned( $borrowernumber, $item->itemnumber, $return_date, $patron->privacy );
1976
                MarkIssueReturned( $borrowernumber, $item->itemnumber, $return_date, $patron->privacy );
1976
            };
1977
            };
1977
            unless ( $@ ) {
1978
            unless ( $@ ) {
1978
                if ( C4::Context->preference('CalculateFinesOnReturn') && !$item->itemlost ) {
1979
                if ( ( $return_date_specified || C4::Context->preference('CalculateFinesOnReturn') ) && !$item->itemlost ) {
1979
                    _CalculateAndUpdateFine( { issue => $issue, item => $item_unblessed, borrower => $patron_unblessed, return_date => $return_date } );
1980
                    _CalculateAndUpdateFine( { issue => $issue, item => $item_unblessed, borrower => $patron_unblessed, return_date => $return_date } );
1980
                }
1981
                }
1981
            } else {
1982
            } else {
1982
- 

Return to bug 24380