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

(-)a/C4/Circulation.pm (-2 / +4 lines)
Lines 1844-1850 sub AddReturn { Link Here
1844
        undef $branch;
1844
        undef $branch;
1845
    }
1845
    }
1846
    $branch = C4::Context->userenv->{'branch'} unless $branch;  # we trust userenv to be a safe fallback/default
1846
    $branch = C4::Context->userenv->{'branch'} unless $branch;  # we trust userenv to be a safe fallback/default
1847
1848
    my $return_date_is_forced = $return_date ? 1 : 0;
1847
    $return_date //= dt_from_string();
1849
    $return_date //= dt_from_string();
1850
1848
    my $messages;
1851
    my $messages;
1849
    my $patron;
1852
    my $patron;
1850
    my $doreturn       = 1;
1853
    my $doreturn       = 1;
Lines 1963-1969 sub AddReturn { Link Here
1963
                MarkIssueReturned( $borrowernumber, $item->itemnumber, $return_date, $patron->privacy );
1966
                MarkIssueReturned( $borrowernumber, $item->itemnumber, $return_date, $patron->privacy );
1964
            };
1967
            };
1965
            unless ( $@ ) {
1968
            unless ( $@ ) {
1966
                if ( C4::Context->preference('CalculateFinesOnReturn') && $is_overdue && !$item->itemlost ) {
1969
                if ( $return_date_is_forced || ( C4::Context->preference('CalculateFinesOnReturn') && $is_overdue && !$item->itemlost ) ) {
1967
                    _CalculateAndUpdateFine( { issue => $issue, item => $item_unblessed, borrower => $patron_unblessed, return_date => $return_date } );
1970
                    _CalculateAndUpdateFine( { issue => $issue, item => $item_unblessed, borrower => $patron_unblessed, return_date => $return_date } );
1968
                }
1971
                }
1969
            } else {
1972
            } else {
1970
- 

Return to bug 24075