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

(-)a/C4/Items.pm (-2 / +2 lines)
Lines 950-956 sub GetItemsInfo { Link Here
950
           holding.opac_info as holding_branch_opac_info,
950
           holding.opac_info as holding_branch_opac_info,
951
           home.opac_info as home_branch_opac_info
951
           home.opac_info as home_branch_opac_info
952
    ";
952
    ";
953
    $query .= ",IF(tmp_holdsqueue.itemnumber,1,0) AS has_pending_hold" if !C4::Context->preference('AllowItemsOnHoldCheckout');
953
    $query .= ",IF(tmp_holdsqueue.itemnumber,1,0) AS has_pending_hold" if !C4::Context->preference('AllowItemsOnHoldCheckoutSIP');
954
    $query .= "
954
    $query .= "
955
     FROM items
955
     FROM items
956
     LEFT JOIN branches AS holding ON items.holdingbranch = holding.branchcode
956
     LEFT JOIN branches AS holding ON items.holdingbranch = holding.branchcode
Lines 964-970 sub GetItemsInfo { Link Here
964
     LEFT JOIN itemtypes   ON   itemtypes.itemtype         = "
964
     LEFT JOIN itemtypes   ON   itemtypes.itemtype         = "
965
     . (C4::Context->preference('item-level_itypes') ? 'items.itype' : 'biblioitems.itemtype');
965
     . (C4::Context->preference('item-level_itypes') ? 'items.itype' : 'biblioitems.itemtype');
966
    $query .= "
966
    $query .= "
967
    LEFT JOIN tmp_holdsqueue USING (itemnumber)" if !C4::Context->preference('AllowItemsOnHoldCheckout');
967
    LEFT JOIN tmp_holdsqueue USING (itemnumber)" if !C4::Context->preference('AllowItemsOnHoldCheckoutSIP');
968
    $query .= q|
968
    $query .= q|
969
    LEFT JOIN localization ON itemtypes.itemtype = localization.code
969
    LEFT JOIN localization ON itemtypes.itemtype = localization.code
970
        AND localization.entity = 'itemtypes'
970
        AND localization.entity = 'itemtypes'
(-)a/C4/SIP/ILS/Transaction/Checkout.pm (-1 / +1 lines)
Lines 57-63 sub do_checkout { Link Here
57
    my $borrower = $patron->unblessed;
57
    my $borrower = $patron->unblessed;
58
	$debug and warn "do_checkout borrower: . " . Dumper $borrower;
58
	$debug and warn "do_checkout borrower: . " . Dumper $borrower;
59
    my ($issuingimpossible, $needsconfirmation) = _can_we_issue($patron, $barcode,
59
    my ($issuingimpossible, $needsconfirmation) = _can_we_issue($patron, $barcode,
60
        C4::Context->preference("AllowItemsOnHoldCheckout")
60
        C4::Context->preference("AllowItemsOnHoldCheckoutSIP")
61
    );
61
    );
62
62
63
    my $noerror=1;  # If set to zero we block the issue
63
    my $noerror=1;  # If set to zero we block the issue
(-)a/C4/UsageStats.pm (-1 / +1 lines)
Lines 134-140 sub BuildReport { Link Here
134
        AgeRestrictionOverride
134
        AgeRestrictionOverride
135
        AllFinesNeedOverride
135
        AllFinesNeedOverride
136
        AllowFineOverride
136
        AllowFineOverride
137
        AllowItemsOnHoldCheckout
137
        AllowItemsOnHoldCheckoutSIP
138
        AllowItemsOnHoldCheckoutSCO
138
        AllowItemsOnHoldCheckoutSCO
139
        AllowNotForLoanOverride
139
        AllowNotForLoanOverride
140
        AllowRenewalLimitOverride
140
        AllowRenewalLimitOverride
(-)a/Koha/Item.pm (-1 / +1 lines)
Lines 383-389 This method checks the tmp_holdsqueue to see if this item has been selected for Link Here
383
sub has_pending_hold {
383
sub has_pending_hold {
384
    my ( $self ) = @_;
384
    my ( $self ) = @_;
385
    my $pending_hold = $self->_result->tmp_holdsqueues;
385
    my $pending_hold = $self->_result->tmp_holdsqueues;
386
    return !C4::Context->preference('AllowItemsOnHoldCheckout') && $pending_hold->count ? 1: 0;
386
    return !C4::Context->preference('AllowItemsOnHoldCheckoutSIP') && $pending_hold->count ? 1: 0;
387
}
387
}
388
388
389
=head3 as_marc_field
389
=head3 as_marc_field
(-)a/installer/data/mysql/atomicupdate/bug_23233.perl (+12 lines)
Line 0 Link Here
1
$DBversion = 'XXX'; # will be replaced by the RM
2
if( CheckVersion( $DBversion ) ) {
3
    $dbh->do(q{
4
        UPDATE systempreferences SET
5
        variable = 'AllowItemsOnHoldCheckoutSIP',
6
        explanation = 'Do not generate RESERVE_WAITING and RESERVED warning when checking out items reserved to someone else via SIP. This allows self checkouts for those items.'
7
        WHERE variable = 'AllowItemsOnHoldCheckout'
8
    });
9
10
    SetVersion( $DBversion );
11
    print "Upgrade to $DBversion done (Bug XXXXX - description)\n";
12
}
(-)a/installer/data/mysql/sysprefs.sql (-1 / +1 lines)
Lines 27-33 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
27
('AllowHoldsOnDamagedItems','1','','Allow hold requests to be placed on damaged items','YesNo'),
27
('AllowHoldsOnDamagedItems','1','','Allow hold requests to be placed on damaged items','YesNo'),
28
('AllowHoldsOnPatronsPossessions','1',NULL,'Allow holds on records that patron have items of it','YesNo'),
28
('AllowHoldsOnPatronsPossessions','1',NULL,'Allow holds on records that patron have items of it','YesNo'),
29
('AllowCheckoutNotes', '0', NULL, 'Allow patrons to submit notes about checked out items.','YesNo'),
29
('AllowCheckoutNotes', '0', NULL, 'Allow patrons to submit notes about checked out items.','YesNo'),
30
('AllowItemsOnHoldCheckout','0','','Do not generate RESERVE_WAITING and RESERVED warning when checking out items reserved to someone else. This allows self checkouts for those items.','YesNo'),
30
('AllowItemsOnHoldCheckoutSIP','0','','Do not generate RESERVE_WAITING and RESERVED warning when checking out items reserved to someone else via SIP. This allows self checkouts for those items.','YesNo'),
31
('AllowItemsOnHoldCheckoutSCO','0','','Do not generate RESERVE_WAITING and RESERVED warning in the SCO module when checking out items reserved to someone else. This allows self checkouts for those items.','YesNo'),
31
('AllowItemsOnHoldCheckoutSCO','0','','Do not generate RESERVE_WAITING and RESERVED warning in the SCO module when checking out items reserved to someone else. This allows self checkouts for those items.','YesNo'),
32
('AllowMultipleCovers','0','1','Allow multiple cover images to be attached to each bibliographic record.','YesNo'),
32
('AllowMultipleCovers','0','1','Allow multiple cover images to be attached to each bibliographic record.','YesNo'),
33
('AllowMultipleIssuesOnABiblio',1,'Allow/Don\'t allow patrons to check out multiple items from one biblio','','YesNo'),
33
('AllowMultipleIssuesOnABiblio',1,'Allow/Don\'t allow patrons to check out multiple items from one biblio','','YesNo'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (-3 / +4 lines)
Lines 202-212 Circulation: Link Here
202
                  no: "Don't allow"
202
                  no: "Don't allow"
203
            - staff to renew items that are on hold by manually specifying a due date.
203
            - staff to renew items that are on hold by manually specifying a due date.
204
        -
204
        -
205
            - pref: AllowItemsOnHoldCheckout
205
            - pref: AllowItemsOnHoldCheckoutSIP
206
              choices:
206
              choices:
207
                  yes: Allow
207
                  yes: Allow
208
                  no: "Don't allow"
208
                  no: "Don't allow"
209
            - checkouts of items reserved to someone else. If allowed do not generate RESERVE_WAITING and RESERVED warning. This allows self checkouts for those items. If using the holds queue items with pending holds will be marked as "unavailable" if this set to "Don't Allow".
209
            - checkouts of items reserved to someone else via SIP checkout messages.
210
            - If allowed do not generate RESERVE_WAITING and RESERVED warning.
211
            - This allows self checkouts for those items. If using the holds queue items with pending holds will be marked as "unavailable" if this set to "Don't Allow".
210
        -
212
        -
211
            - pref: AllowItemsOnHoldCheckoutSCO
213
            - pref: AllowItemsOnHoldCheckoutSCO
212
              choices:
214
              choices:
213
- 

Return to bug 23233