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

(-)a/C4/SIP/ILS.pm (-2 / +3 lines)
Lines 205-212 sub checkin { Link Here
205
    # BEGIN TRANSACTION
205
    # BEGIN TRANSACTION
206
    $circ->item( $item = C4::SIP::ILS::Item->new($item_id) );
206
    $circ->item( $item = C4::SIP::ILS::Item->new($item_id) );
207
207
208
    my $data;
208
    if ($item) {
209
    if ($item) {
209
        $circ->do_checkin( $current_loc, $return_date );
210
        $data = $circ->do_checkin( $current_loc, $return_date );
210
    }
211
    }
211
    else {
212
    else {
212
        $circ->alert(1);
213
        $circ->alert(1);
Lines 219-225 sub checkin { Link Here
219
    if( !$circ->ok && $circ->alert_type && $circ->alert_type == 98 ) { # data corruption
220
    if( !$circ->ok && $circ->alert_type && $circ->alert_type == 98 ) { # data corruption
220
        $circ->screen_msg("Checkin failed: data problem");
221
        $circ->screen_msg("Checkin failed: data problem");
221
        syslog( "LOG_WARNING", "Problem with issue_id in issues and old_issues; check the about page" );
222
        syslog( "LOG_WARNING", "Problem with issue_id in issues and old_issues; check the about page" );
222
    } elsif( !$item->{patron} ) {
223
    } elsif( !$item->{patron} && !$data->{messages}->{withdrawn} ) {
223
        if( $checked_in_ok ) { # Mark checkin ok although book not checked out
224
        if( $checked_in_ok ) { # Mark checkin ok although book not checked out
224
            $circ->ok( 1 );
225
            $circ->ok( 1 );
225
            syslog("LOG_DEBUG", "C4::SIP::ILS::Checkin - using checked_in_ok");
226
            syslog("LOG_DEBUG", "C4::SIP::ILS::Checkin - using checked_in_ok");
(-)a/C4/SIP/ILS/Transaction/Checkin.pm (-1 / +2 lines)
Lines 119-124 sub do_checkin { Link Here
119
    }
119
    }
120
    $self->alert(1) if defined $self->alert_type;  # alert_type could be "00", hypothetically
120
    $self->alert(1) if defined $self->alert_type;  # alert_type could be "00", hypothetically
121
    $self->ok($return);
121
    $self->ok($return);
122
123
    return { messages => $messages };
122
}
124
}
123
125
124
sub resensitize {
126
sub resensitize {
125
- 

Return to bug 22076