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

(-)a/C4/Circulation.pm (-1 / +1 lines)
Lines 880-886 sub CanBookBeIssued { Link Here
880 
    }
 880 
    }
881 

          881
          

        

        

          882
          
    # Additional Materials Check

          882
          
    # Additional Materials Check

        

          
            

              883
              
    if ( C4::Context->preference("CircConfirmParts") ) {


              883
              
    if ( C4::Context->preference("CircConfirmItemParts") ) {

            

        

          884
          
        my $no_of_parts = $item_object->materials || 0;

          884
          
        my $no_of_parts = $item_object->materials || 0;

        

        

          885
          
        if ( $no_of_parts > 0 ) {

          885
          
        if ( $no_of_parts > 0 ) {

        

        

          886
          
            $needsconfirmation{additional_materials} = $no_of_parts;

          886
          
            $needsconfirmation{additional_materials} = $no_of_parts;

        



(-)a/circ/returns.pl
      (-1 / +1 lines)




  

    
      
            Lines 297-303
          if ($barcode) {
      
      
        Link Here
      
    
  

        

          297
          

          297
          

        

        

          298
          
    # Block return if multi-part and confirm has not been received

          298
          
    # Block return if multi-part and confirm has not been received

        

        

          299
          
    my $needs_confirm = 0;

          299
          
    my $needs_confirm = 0;

        

          
            

              300
              
    if ( C4::Context->preference("CircConfirmParts") ) {


              300
              
    if ( C4::Context->preference("CircConfirmItemParts") ) {

            

        

          301
          
        if ( $item->materials > 0 && !$query->param('multiple_confirm') ) {

          301
          
        if ( $item->materials > 0 && !$query->param('multiple_confirm') ) {

        

        

          302
          
                $needs_confirm = 1;

          302
          
                $needs_confirm = 1;

        

        

          303
          
        }

          303
          
        }

        



(-)a/installer/data/mysql/atomicupdate/bug_25261.perl
      (-2 / +2 lines)




  

    
      
            Lines 1-6
          
      
      
        Link Here
      
    
  

        

          1
          
$DBversion = 'XXX'; # will be replaced by the RM

          1
          
$DBversion = 'XXX'; # will be replaced by the RM

        

        

          2
          
if( CheckVersion( $DBversion ) ) {

          2
          
if( CheckVersion( $DBversion ) ) {

        

          
            

              3
              
    $dbh->do(q{INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('CircConfirmParts', '0', NULL, 'Require staff to confirm that all parts of an item are present at checkin/checkout.', 'YesNo') });


              3
              
    $dbh->do(q{INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('CircConfirmItemParts', '0', NULL, 'Require staff to confirm that all parts of an item are present at checkin/checkout.', 'YesNo') });

            

        

          4
          

          4
          

        

          
            

              5
              
    NewVersion( $DBversion, 25261, "Add CircConfirmParts syspref");


              5
              
    NewVersion( $DBversion, 25261, "Add CircConfirmItemParts syspref");

            

        

          6
          
}

          6
          
}

        



(-)a/installer/data/mysql/sysprefs.sql
      (-1 / +1 lines)




  

    
      
            Lines 121-127
          INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
      
      
        Link Here
      
    
  

        

          121
          
('CataloguingLog','1',NULL,'If ON, log edit/create/delete actions on bibliographic data. WARNING: this feature is very resource consuming.','YesNo'),

          121
          
('CataloguingLog','1',NULL,'If ON, log edit/create/delete actions on bibliographic data. WARNING: this feature is very resource consuming.','YesNo'),

        

        

          122
          
('CheckPrevCheckout','hardno','hardyes|softyes|softno|hardno','By default, for every item checked out, should we warn if the patron has borrowed that item in the past?','Choice'),

          122
          
('CheckPrevCheckout','hardno','hardyes|softyes|softno|hardno','By default, for every item checked out, should we warn if the patron has borrowed that item in the past?','Choice'),

        

        

          123
          
('CircAutoPrintQuickSlip','qslip',NULL,'Choose what should happen when an empty barcode field is submitted in circulation: Display a print quick slip window, Display a print slip window or Clear the screen.','Choice'),

          123
          
('CircAutoPrintQuickSlip','qslip',NULL,'Choose what should happen when an empty barcode field is submitted in circulation: Display a print quick slip window, Display a print slip window or Clear the screen.','Choice'),

        

          
            

              124
              
('CircConfirmParts', '0', NULL, 'Require staff to confirm that all parts of an item are present at checkin/checkout.', 'Yes/No'),


              124
              
('CircConfirmItemParts', '0', NULL, 'Require staff to confirm that all parts of an item are present at checkin/checkout.', 'Yes/No'),

            

        

          125
          
('CircControl','ItemHomeLibrary','PickupLibrary|PatronLibrary|ItemHomeLibrary','Specify the agency that controls the circulation and fines policy','Choice'),

          125
          
('CircControl','ItemHomeLibrary','PickupLibrary|PatronLibrary|ItemHomeLibrary','Specify the agency that controls the circulation and fines policy','Choice'),

        

        

          126
          
('CircSidebar','0',NULL,'Activate or deactivate the navigation sidebar on all Circulation pages','YesNo'),

          126
          
('CircSidebar','0',NULL,'Activate or deactivate the navigation sidebar on all Circulation pages','YesNo'),

        

        

          127
          
('CirculateILL','0','','If enabled, it is possible to circulate ILL items from within ILL','YesNo'),

          127
          
('CirculateILL','0','','If enabled, it is possible to circulate ILL items from within ILL','YesNo'),

        



(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
      (-2 / +1 lines)




  

    
      
            Lines 7-13
          Circulation:
      
      
        Link Here
      
    
  

        

          7
          
                  no: Deactivate

          7
          
                  no: Deactivate

        

        

          8
          
            - the navigation sidebar on all Circulation pages.

          8
          
            - the navigation sidebar on all Circulation pages.

        

        

          9
          
        -

          9
          
        -

        

          
            

              10
              
            - pref: CircConfirmParts


              10
              
            - pref: CircConfirmItemParts

            

        

          11
          
              choices:

          11
          
              choices:

        

        

          12
          
                  yes: "Require"

          12
          
                  yes: "Require"

        

        

          13
          
                  no: "Don't require"

          13
          
                  no: "Don't require"

        

            

              14
              
- 

              
              
            






  

  Return to bug 25261