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

(-)a/C4/Circulation.pm (+2 lines)
Lines 2171-2176 sub AddReturn { Link Here
2171
            if ( $transfer->tobranch eq $branch ) {
2171
            if ( $transfer->tobranch eq $branch ) {
2172
                $transfer->receive;
2172
                $transfer->receive;
2173
                $messages->{'TransferArrived'} = $transfer->frombranch;
2173
                $messages->{'TransferArrived'} = $transfer->frombranch;
2174
                $validTransfer = 1 if $transfer->reason eq 'Reserve';
2174
            }
2175
            }
2175
            else {
2176
            else {
2176
                $messages->{'WrongTransfer'}     = $transfer->tobranch;
2177
                $messages->{'WrongTransfer'}     = $transfer->tobranch;
Lines 2181-2186 sub AddReturn { Link Here
2181
            if ( $transfer->tobranch eq $branch ) {
2182
            if ( $transfer->tobranch eq $branch ) {
2182
                $transfer->receive;
2183
                $transfer->receive;
2183
                $messages->{'TransferArrived'} = $transfer->frombranch;
2184
                $messages->{'TransferArrived'} = $transfer->frombranch;
2185
                $validTransfer = 1 if $transfer->reason eq 'Reserve';
2184
            }
2186
            }
2185
            else {
2187
            else {
2186
                $messages->{'WasTransfered'}   = $transfer->tobranch;
2188
                $messages->{'WasTransfered'}   = $transfer->tobranch;
(-)a/Koha/Hold.pm (-9 lines)
Lines 514-527 sub cancel { Link Here
514
514
515
    $self->_result->result_source->schema->txn_do(
515
    $self->_result->result_source->schema->txn_do(
516
        sub {
516
        sub {
517
            if ( $self->is_in_transit ) {
518
                my $transfer = $self->item->get_transfer;
519
                # NOTE: Transfers are well bound with Holds.. as such we have to check that there is actually a
520
                # transfer enqueued and in transit here prior to trying to cancel it.
521
                if ( $transfer && $transfer->in_transit ) {
522
                    $transfer->cancel({ reason => 'CancelReserve', force => 1 });
523
                }
524
            }
525
            $self->cancellationdate( dt_from_string->strftime( '%Y-%m-%d %H:%M:%S' ) );
517
            $self->cancellationdate( dt_from_string->strftime( '%Y-%m-%d %H:%M:%S' ) );
526
            $self->priority(0);
518
            $self->priority(0);
527
            $self->cancellation_reason( $params->{cancellation_reason} );
519
            $self->cancellation_reason( $params->{cancellation_reason} );
528
- 

Return to bug 28520