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

(-)a/C4/Circulation.pm (-2 / +9 lines)
Lines 1950-1955 sub AddReturn { Link Here
1950
        }
1950
        }
1951
    }
1951
    }
1952
1952
1953
    my $show_checkin_message = 0;
1953
    # fix up the overdues in accounts...
1954
    # fix up the overdues in accounts...
1954
    if ($borrowernumber) {
1955
    if ($borrowernumber) {
1955
        my $fix = _FixOverduesOnReturn($borrowernumber, $item->{itemnumber}, $exemptfine, $dropbox);
1956
        my $fix = _FixOverduesOnReturn($borrowernumber, $item->{itemnumber}, $exemptfine, $dropbox);
Lines 1964-1971 sub AddReturn { Link Here
1964
            } else {
1965
            } else {
1965
                $messages->{'Debarred'} = $debardate if $debardate;
1966
                $messages->{'Debarred'} = $debardate if $debardate;
1966
            }
1967
            }
1968
	    if (!$debardate && $borrower->{debarred}) {
1969
                $show_checkin_message = 1;
1970
	    }
1967
        # there's no overdue on the item but borrower had been previously debarred
1971
        # there's no overdue on the item but borrower had been previously debarred
1968
        } elsif ( $issue->{date_due} and $borrower->{'debarred'} ) {
1972
        } elsif ( $issue->{date_due} and $borrower->{'debarred'} ) {
1973
	     $show_checkin_message = 1;
1974
	}
1975
1976
	if ($show_checkin_message) {
1969
             if ( $borrower->{debarred} eq "9999-12-31") {
1977
             if ( $borrower->{debarred} eq "9999-12-31") {
1970
                $messages->{'ForeverDebarred'} = $borrower->{'debarred'};
1978
                $messages->{'ForeverDebarred'} = $borrower->{'debarred'};
1971
             } else {
1979
             } else {
Lines 1975-1981 sub AddReturn { Link Here
1975
                  if ( DateTime->compare( $borrower_debar_dt, $today_dt ) != -1 ) {
1983
                  if ( DateTime->compare( $borrower_debar_dt, $today_dt ) != -1 ) {
1976
                      $messages->{'PrevDebarred'} = $borrower->{'debarred'};
1984
                      $messages->{'PrevDebarred'} = $borrower->{'debarred'};
1977
                  }
1985
                  }
1978
             }
1986
            }
1979
        }
1987
        }
1980
    }
1988
    }
1981
1989
1982
- 

Return to bug 14784