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

(-)a/C4/Circulation.pm (-2 / +2 lines)
Lines 1837-1842 sub AddReturn { Link Here
1837
        undef $branch;
1837
        undef $branch;
1838
    }
1838
    }
1839
    $branch = C4::Context->userenv->{'branch'} unless $branch;  # we trust userenv to be a safe fallback/default
1839
    $branch = C4::Context->userenv->{'branch'} unless $branch;  # we trust userenv to be a safe fallback/default
1840
    my $return_date_specified = $return_date ? 1 : 0;
1840
    $return_date //= dt_from_string();
1841
    $return_date //= dt_from_string();
1841
    my $messages;
1842
    my $messages;
1842
    my $patron;
1843
    my $patron;
Lines 1952-1958 sub AddReturn { Link Here
1952
                MarkIssueReturned( $borrowernumber, $item->itemnumber, $return_date, $patron->privacy );
1953
                MarkIssueReturned( $borrowernumber, $item->itemnumber, $return_date, $patron->privacy );
1953
            };
1954
            };
1954
            unless ( $@ ) {
1955
            unless ( $@ ) {
1955
                if ( C4::Context->preference('CalculateFinesOnReturn') && $is_overdue ) {
1956
                if ( $return_date_specified || ( C4::Context->preference('CalculateFinesOnReturn') && $is_overdue ) ) {
1956
                    _CalculateAndUpdateFine( { issue => $issue, item => $item_unblessed, borrower => $patron_unblessed, return_date => $return_date } );
1957
                    _CalculateAndUpdateFine( { issue => $issue, item => $item_unblessed, borrower => $patron_unblessed, return_date => $return_date } );
1957
                }
1958
                }
1958
            } else {
1959
            } else {
1959
- 

Return to bug 22539