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

(-)a/C4/SIP/ILS.pm (-2 / +1 lines)
Lines 207-213 sub checkin { Link Here
207 

          207
          

        

        

          208
          
    my $data;

          208
          
    my $data;

        

        

          209
          
    if ($item) {

          209
          
    if ($item) {

        

          
            

              210
              
        $data = $circ->do_checkin( $current_loc, $return_date, $cv_triggers_alert );


              210
              
        $data = $circ->do_checkin( $current_loc, $return_date, $cv_triggers_alert, $checked_in_ok );

            

        

          211
          
    }

          211
          
    }

        

        

          212
          
    else {

          212
          
    else {

        

        

          213
          
        $circ->alert(1);

          213
          
        $circ->alert(1);

        

  

    
      
            Lines 229-235
          sub checkin {
      
      
        Link Here
      
    
  

        

          229
          
    } elsif ( !$item->{patron} ) {

          229
          
    } elsif ( !$item->{patron} ) {

        

        

          230
          
        if ( $checked_in_ok ) { # Mark checkin ok although book not checked out

          230
          
        if ( $checked_in_ok ) { # Mark checkin ok although book not checked out

        

        

          231
          
            $circ->ok( 1 );

          231
          
            $circ->ok( 1 );

        

            

              232
              
            $circ->alert( 0 );

              
              
            

        

          233
          
            syslog("LOG_DEBUG", "C4::SIP::ILS::Checkin - using checked_in_ok");

          232
          
            syslog("LOG_DEBUG", "C4::SIP::ILS::Checkin - using checked_in_ok");

        

        

          234
          
        } else {

          233
          
        } else {

        

        

          235
          
            $circ->screen_msg("Item not checked out");

          234
          
            $circ->screen_msg("Item not checked out");

        



(-)a/C4/SIP/ILS/Transaction/Checkin.pm
      (-2 / +7 lines)




  

    
      
            Lines 49-54
          sub do_checkin {
      
      
        Link Here
      
    
  

        

          49
          
    my $branch = shift;

          49
          
    my $branch = shift;

        

        

          50
          
    my $return_date = shift;

          50
          
    my $return_date = shift;

        

        

          51
          
    my $cv_triggers_alert = shift;

          51
          
    my $cv_triggers_alert = shift;

        

            

              
              
              52
              
    my $checked_in_ok = shift;

            

        

          52
          

          53
          

        

        

          53
          
    if (!$branch) {

          54
          
    if (!$branch) {

        

        

          54
          
        $branch = 'SIP2';

          55
          
        $branch = 'SIP2';

        

  

    
      
            Lines 69-75
          sub do_checkin {
      
      
        Link Here
      
    
  

        

          69
          

          70
          

        

        

          70
          
    $debug and warn "do_checkin() calling AddReturn($barcode, $branch)";

          71
          
    $debug and warn "do_checkin() calling AddReturn($barcode, $branch)";

        

        

          71
          
    my ($return, $messages, $issue, $borrower) = AddReturn($barcode, $branch, undef, dt_from_string($return_date));

          72
          
    my ($return, $messages, $issue, $borrower) = AddReturn($barcode, $branch, undef, dt_from_string($return_date));

        

          
            

              72
              
    $self->alert(!$return);


              73
              
    if ($checked_in_ok){

            

            

              
              

              74
              
        $debug and warn 'not raising alert when AddReturn() does not return a value for $return due to $checked_in_ok being set to true';

            

            


              75
              
    }

            

            


              76
              
    else {

            

            


              77
              
        $self->alert(!$return);

            

            


              78
              
    }

            

        

          73
          
    # ignoring messages: NotIssued, WasLost, WasTransfered

          79
          
    # ignoring messages: NotIssued, WasLost, WasTransfered

        

        

          74
          

          80
          

        

        

          75
          
    # biblionumber, biblioitemnumber, itemnumber

          81
          
    # biblionumber, biblioitemnumber, itemnumber

        

            

              76
              
- 

              
              
            






  

  Return to bug 23057