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

(-)a/C4/Circulation.pm (-2 / +9 lines)
Lines 2074-2079 sub AddReturn { Link Here
2074
        }
2074
        }
2075
    }
2075
    }
2076
2076
2077
    my $show_checkin_message = 0;
2077
    # fix up the overdues in accounts...
2078
    # fix up the overdues in accounts...
2078
    if ($borrowernumber) {
2079
    if ($borrowernumber) {
2079
        my $fix = _FixOverduesOnReturn($borrowernumber, $item->{itemnumber}, $exemptfine, $dropbox);
2080
        my $fix = _FixOverduesOnReturn($borrowernumber, $item->{itemnumber}, $exemptfine, $dropbox);
Lines 2088-2095 sub AddReturn { Link Here
2088
            } else {
2089
            } else {
2089
                $messages->{'Debarred'} = $debardate if $debardate;
2090
                $messages->{'Debarred'} = $debardate if $debardate;
2090
            }
2091
            }
2092
	    if (!$debardate && $borrower->{debarred}) {
2093
                $show_checkin_message = 1;
2094
	    }
2091
        # there's no overdue on the item but borrower had been previously debarred
2095
        # there's no overdue on the item but borrower had been previously debarred
2092
        } elsif ( $issue->{date_due} and $borrower->{'debarred'} ) {
2096
        } elsif ( $issue->{date_due} and $borrower->{'debarred'} ) {
2097
	     $show_checkin_message = 1;
2098
	}
2099
2100
	if ($show_checkin_message) {
2093
             if ( $borrower->{debarred} eq "9999-12-31") {
2101
             if ( $borrower->{debarred} eq "9999-12-31") {
2094
                $messages->{'ForeverDebarred'} = $borrower->{'debarred'};
2102
                $messages->{'ForeverDebarred'} = $borrower->{'debarred'};
2095
             } else {
2103
             } else {
Lines 2099-2105 sub AddReturn { Link Here
2099
                  if ( DateTime->compare( $borrower_debar_dt, $today_dt ) != -1 ) {
2107
                  if ( DateTime->compare( $borrower_debar_dt, $today_dt ) != -1 ) {
2100
                      $messages->{'PrevDebarred'} = $borrower->{'debarred'};
2108
                      $messages->{'PrevDebarred'} = $borrower->{'debarred'};
2101
                  }
2109
                  }
2102
             }
2110
            }
2103
        }
2111
        }
2104
    }
2112
    }
2105
2113
2106
- 

Return to bug 14784