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

(-)a/C4/Circulation.pm (-2 / +2 lines)
Lines 1843-1848 sub AddReturn { Link Here
1843
        undef $branch;
1843
        undef $branch;
1844
    }
1844
    }
1845
    $branch = C4::Context->userenv->{'branch'} unless $branch;  # we trust userenv to be a safe fallback/default
1845
    $branch = C4::Context->userenv->{'branch'} unless $branch;  # we trust userenv to be a safe fallback/default
1846
    my $return_date_specified = !!$return_date;
1846
    $return_date //= dt_from_string();
1847
    $return_date //= dt_from_string();
1847
    my $messages;
1848
    my $messages;
1848
    my $patron;
1849
    my $patron;
Lines 1960-1966 sub AddReturn { Link Here
1960
                MarkIssueReturned( $borrowernumber, $item->itemnumber, $return_date, $patron->privacy );
1961
                MarkIssueReturned( $borrowernumber, $item->itemnumber, $return_date, $patron->privacy );
1961
            };
1962
            };
1962
            unless ( $@ ) {
1963
            unless ( $@ ) {
1963
                if ( C4::Context->preference('CalculateFinesOnReturn') && !$item->itemlost ) {
1964
                if ( ( $return_date_specified || C4::Context->preference('CalculateFinesOnReturn') ) && !$item->itemlost ) {
1964
                    _CalculateAndUpdateFine( { issue => $issue, item => $item_unblessed, borrower => $patron_unblessed, return_date => $return_date } );
1965
                    _CalculateAndUpdateFine( { issue => $issue, item => $item_unblessed, borrower => $patron_unblessed, return_date => $return_date } );
1965
                }
1966
                }
1966
            } else {
1967
            } else {
1967
- 

Return to bug 24380