Bug 23057: If checked_in_ok is set and item is not checked out, alert flag is supress...

[koha-equinox.git] / C4 / SIP / ILS.pm

diff --git a/C4/SIP/ILS.pm b/C4/SIP/ILS.pm
index e915887..b543539 100644 (file)
--- a/C4/SIP/ILS.pm
+++ b/C4/SIP/ILS.pm
@@ -207,7 +207,7 @@ sub checkin {
 
     my $data;
     if ($item) {
-        $data = $circ->do_checkin( $current_loc, $return_date, $cv_triggers_alert );
+        $data = $circ->do_checkin( $current_loc, $return_date, $cv_triggers_alert, $checked_in_ok );
     }
     else {
         $circ->alert(1);
@@ -217,24 +217,24 @@ sub checkin {
         return $circ;
     }
 
-    if( !$circ->ok && $circ->alert_type && $circ->alert_type == 98 ) { # data corruption
+    if ( !$circ->ok && $circ->alert_type && $circ->alert_type == 98 ) { # data corruption
         $circ->screen_msg("Checkin failed: data problem");
         syslog( "LOG_WARNING", "Problem with issue_id in issues and old_issues; check the about page" );
-    } elsif( $data->{messages}->{withdrawn} && !$circ->ok ) {
+    } elsif ( $data->{messages}->{withdrawn} && !$circ->ok ) {
             $circ->screen_msg("Item withdrawn, return not allowed");
             syslog("LOG_DEBUG", "C4::SIP::ILS::Checkin - item withdrawn");
-    } elsif( $data->{messages}->{WasLost} && !$circ->ok ) {
+    } elsif ( $data->{messages}->{WasLost} && !$circ->ok ) {
             $circ->screen_msg("Item lost, return not allowed");
             syslog("LOG_DEBUG", "C4::SIP::ILS::Checkin - item lost");
-    } elsif( !$item->{patron} ) {
-        if( $checked_in_ok ) { # Mark checkin ok although book not checked out
+    } elsif ( !$item->{patron} ) {
+        if ( $checked_in_ok ) { # Mark checkin ok although book not checked out
             $circ->ok( 1 );
             syslog("LOG_DEBUG", "C4::SIP::ILS::Checkin - using checked_in_ok");
         } else {
             $circ->screen_msg("Item not checked out");
             syslog("LOG_DEBUG", "C4::SIP::ILS::Checkin - item not checked out");
         }
-    } elsif( $circ->ok ) {
+    } elsif ( $circ->ok ) {
         $circ->patron( $patron = C4::SIP::ILS::Patron->new( $item->{patron} ) );
         delete $item->{patron};
         delete $item->{due_date};