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

(-)a/C4/Reserves.pm (-4 / +1 lines)
Lines 1137-1145 sub ModReserveAffect { Link Here
1137
    $hold->itemnumber($itemnumber);
1137
    $hold->itemnumber($itemnumber);
1138
    $hold->set_waiting($transferToDo);
1138
    $hold->set_waiting($transferToDo);
1139
1139
1140
    _koha_notify_reserve( $hold->reserve_id )
1141
      if ( !$transferToDo && !$already_on_shelf );
1142
1143
    if( !$transferToDo ){
1140
    if( !$transferToDo ){
1144
        _koha_notify_reserve( $hold->reserve_id ) unless $already_on_shelf;
1141
        _koha_notify_reserve( $hold->reserve_id ) unless $already_on_shelf;
1145
        my $transfers = Koha::Item::Transfers->search({
1142
        my $transfers = Koha::Item::Transfers->search({
Lines 1147-1153 sub ModReserveAffect { Link Here
1147
            datearrived => undef
1144
            datearrived => undef
1148
        });
1145
        });
1149
        while( my $transfer = $transfers->next ){
1146
        while( my $transfer = $transfers->next ){
1150
            $transfer->datearrived( DateTime->now( time_zone => C4::Context->tz() ) )->store;
1147
            $transfer->datearrived( dt_from_string() )->store;
1151
        };
1148
        };
1152
    }
1149
    }
1153
1150
(-)a/t/db_dependent/Circulation.t (-8 / +8 lines)
Lines 3749-3756 subtest 'Filling a hold should cancel existing transfer' => sub { Link Here
3749
3749
3750
    t::lib::Mocks::mock_preference('AutomaticItemReturn', 1);
3750
    t::lib::Mocks::mock_preference('AutomaticItemReturn', 1);
3751
3751
3752
    my $libraryA = $builder->build_object( { class => 'Koha::Libraries' } )->store;
3752
    my $libraryA = $builder->build_object( { class => 'Koha::Libraries' } );
3753
    my $libraryB = $builder->build_object( { class => 'Koha::Libraries' } )->store;
3753
    my $libraryB = $builder->build_object( { class => 'Koha::Libraries' } );
3754
    my $patron = $builder->build_object(
3754
    my $patron = $builder->build_object(
3755
        {
3755
        {
3756
            class => 'Koha::Patrons',
3756
            class => 'Koha::Patrons',
Lines 3767-3777 subtest 'Filling a hold should cancel existing transfer' => sub { Link Here
3767
3767
3768
    my ( undef, $message ) = AddReturn( $item->barcode, $libraryA->branchcode, undef, undef );
3768
    my ( undef, $message ) = AddReturn( $item->barcode, $libraryA->branchcode, undef, undef );
3769
    is( Koha::Item::Transfers->search({ itemnumber => $item->itemnumber, datearrived => undef })->count, 1, "We generate a transfer on checkin");
3769
    is( Koha::Item::Transfers->search({ itemnumber => $item->itemnumber, datearrived => undef })->count, 1, "We generate a transfer on checkin");
3770
    AddReserve(
3770
    AddReserve({
3771
        $libraryA->branchcode, $patron->borrowernumber, $item->biblionumber, '',
3771
        branchcode     => $libraryA->branchcode,
3772
        1, undef, undef, '',
3772
        borrowernumber => $patron->borrowernumber,
3773
        undef, $item->itemnumber, undef, undef
3773
        biblionumber   => $item->biblionumber,
3774
    );
3774
        itemnumber     => $item->itemnumber
3775
    });
3775
    my $reserves = Koha::Holds->search({ itemnumber => $item->itemnumber });
3776
    my $reserves = Koha::Holds->search({ itemnumber => $item->itemnumber });
3776
    is( $reserves->count, 1, "Reserve is placed");
3777
    is( $reserves->count, 1, "Reserve is placed");
3777
    ( undef, $message ) = AddReturn( $item->barcode, $libraryA->branchcode, undef, undef );
3778
    ( undef, $message ) = AddReturn( $item->barcode, $libraryA->branchcode, undef, undef );
3778
- 

Return to bug 24620