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

(-)a/C4/Reserves.pm (-4 / +1 lines)
Lines 1139-1147 sub ModReserveAffect { Link Here
1139
    $hold->itemnumber($itemnumber);
1139
    $hold->itemnumber($itemnumber);
1140
    $hold->set_waiting($transferToDo);
1140
    $hold->set_waiting($transferToDo);
1141
1141
1142
    _koha_notify_reserve( $hold->reserve_id )
1143
      if ( !$transferToDo && !$already_on_shelf );
1144
1145
    if( !$transferToDo ){
1142
    if( !$transferToDo ){
1146
        _koha_notify_reserve( $hold->reserve_id ) unless $already_on_shelf;
1143
        _koha_notify_reserve( $hold->reserve_id ) unless $already_on_shelf;
1147
        my $transfers = Koha::Item::Transfers->search({
1144
        my $transfers = Koha::Item::Transfers->search({
Lines 1149-1155 sub ModReserveAffect { Link Here
1149
            datearrived => undef
1146
            datearrived => undef
1150
        });
1147
        });
1151
        while( my $transfer = $transfers->next ){
1148
        while( my $transfer = $transfers->next ){
1152
            $transfer->datearrived( DateTime->now( time_zone => C4::Context->tz() ) )->store;
1149
            $transfer->datearrived( dt_from_string() )->store;
1153
        };
1150
        };
1154
    }
1151
    }
1155
1152
(-)a/t/db_dependent/Circulation.t (-8 / +8 lines)
Lines 3820-3827 subtest 'Filling a hold should cancel existing transfer' => sub { Link Here
3820
3820
3821
    t::lib::Mocks::mock_preference('AutomaticItemReturn', 1);
3821
    t::lib::Mocks::mock_preference('AutomaticItemReturn', 1);
3822
3822
3823
    my $libraryA = $builder->build_object( { class => 'Koha::Libraries' } )->store;
3823
    my $libraryA = $builder->build_object( { class => 'Koha::Libraries' } );
3824
    my $libraryB = $builder->build_object( { class => 'Koha::Libraries' } )->store;
3824
    my $libraryB = $builder->build_object( { class => 'Koha::Libraries' } );
3825
    my $patron = $builder->build_object(
3825
    my $patron = $builder->build_object(
3826
        {
3826
        {
3827
            class => 'Koha::Patrons',
3827
            class => 'Koha::Patrons',
Lines 3838-3848 subtest 'Filling a hold should cancel existing transfer' => sub { Link Here
3838
3838
3839
    my ( undef, $message ) = AddReturn( $item->barcode, $libraryA->branchcode, undef, undef );
3839
    my ( undef, $message ) = AddReturn( $item->barcode, $libraryA->branchcode, undef, undef );
3840
    is( Koha::Item::Transfers->search({ itemnumber => $item->itemnumber, datearrived => undef })->count, 1, "We generate a transfer on checkin");
3840
    is( Koha::Item::Transfers->search({ itemnumber => $item->itemnumber, datearrived => undef })->count, 1, "We generate a transfer on checkin");
3841
    AddReserve(
3841
    AddReserve({
3842
        $libraryA->branchcode, $patron->borrowernumber, $item->biblionumber, '',
3842
        branchcode     => $libraryA->branchcode,
3843
        1, undef, undef, '',
3843
        borrowernumber => $patron->borrowernumber,
3844
        undef, $item->itemnumber, undef, undef
3844
        biblionumber   => $item->biblionumber,
3845
    );
3845
        itemnumber     => $item->itemnumber
3846
    });
3846
    my $reserves = Koha::Holds->search({ itemnumber => $item->itemnumber });
3847
    my $reserves = Koha::Holds->search({ itemnumber => $item->itemnumber });
3847
    is( $reserves->count, 1, "Reserve is placed");
3848
    is( $reserves->count, 1, "Reserve is placed");
3848
    ( undef, $message ) = AddReturn( $item->barcode, $libraryA->branchcode, undef, undef );
3849
    ( undef, $message ) = AddReturn( $item->barcode, $libraryA->branchcode, undef, undef );
3849
- 

Return to bug 24620