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

(-)a/Koha/Item.pm (-2 lines)
Lines 319-326 sub pickup_locations { Link Here
319
    my $branch_control = C4::Context->preference('HomeOrHoldingBranch');
319
    my $branch_control = C4::Context->preference('HomeOrHoldingBranch');
320
    my $library = $branch_control eq 'holdingbranch' ? $self->holding_branch : $self->home_branch;
320
    my $library = $branch_control eq 'holdingbranch' ? $self->holding_branch : $self->home_branch;
321
321
322
    #warn $branch_control.' '.$branchitemrule->{holdallowed}.' '.$library->branchcode.' '.$patron->branchcode;
323
324
    my @libs;
322
    my @libs;
325
    if(defined $patron) {
323
    if(defined $patron) {
326
        return @libs if $branchitemrule->{holdallowed} == 3 && !$library->validate_hold_sibling( {branchcode => $patron->branchcode} );
324
        return @libs if $branchitemrule->{holdallowed} == 3 && !$library->validate_hold_sibling( {branchcode => $patron->branchcode} );
(-)a/t/db_dependent/Holds.t (-1 / +10 lines)
Lines 244-250 is( $hold->priority, '6', "Test AlterPriority(), move to bottom" ); Link Here
244
my $foreign_biblio = $builder->build_sample_biblio({ itemtype => 'DUMMY' });
244
my $foreign_biblio = $builder->build_sample_biblio({ itemtype => 'DUMMY' });
245
my ($foreign_item_bibnum, $foreign_item_bibitemnum, $foreign_itemnumber)
245
my ($foreign_item_bibnum, $foreign_item_bibitemnum, $foreign_itemnumber)
246
  = AddItem({ homebranch => $branch_2, holdingbranch => $branch_2 } , $foreign_biblio->biblionumber);
246
  = AddItem({ homebranch => $branch_2, holdingbranch => $branch_2 } , $foreign_biblio->biblionumber);
247
# Cleanup circulation rules
247
$dbh->do('DELETE FROM issuingrules');
248
$dbh->do('DELETE FROM issuingrules');
249
$dbh->do('DELETE FROM branch_item_rules');
250
$dbh->do('DELETE FROM default_branch_item_rules');
251
$dbh->do('DELETE FROM default_branch_circ_rules');
252
$dbh->do('DELETE FROM default_circ_rules');
248
$dbh->do(
253
$dbh->do(
249
    q{INSERT INTO issuingrules (categorycode, branchcode, itemtype, reservesallowed, holds_per_record)
254
    q{INSERT INTO issuingrules (categorycode, branchcode, itemtype, reservesallowed, holds_per_record)
250
      VALUES (?, ?, ?, ?, ?)},
255
      VALUES (?, ?, ?, ?, ?)},
Lines 565-570 subtest 'CanItemBeReserved / holds_per_day tests' => sub { Link Here
565
570
566
    Koha::Holds->search->delete;
571
    Koha::Holds->search->delete;
567
    $dbh->do('DELETE FROM issues');
572
    $dbh->do('DELETE FROM issues');
573
    $dbh->do('DELETE FROM issuingrules');
574
    $dbh->do('DELETE FROM branch_item_rules');
575
    $dbh->do('DELETE FROM default_branch_item_rules');
576
    $dbh->do('DELETE FROM default_branch_circ_rules');
577
    $dbh->do('DELETE FROM default_circ_rules');
568
    Koha::Items->search->delete;
578
    Koha::Items->search->delete;
569
    Koha::Biblios->search->delete;
579
    Koha::Biblios->search->delete;
570
580
571
- 

Return to bug 22284