From 0ff47f87eff41c2c39fd3da360b6c5d1c8dbe8de Mon Sep 17 00:00:00 2001
From: =?utf8?q?Joonas=20Kylm=C3=A4l=C3=A4?= <joonas.kylmala@helsinki.fi>
Date: Tue, 8 Jun 2021 07:50:05 +0000
Subject: [PATCH] Bug 28520: Revert "Bug 12362: Cancel transfer with hold
 cancelation"
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This reverts commit 6c105829144cd341a4bc65ad8d0ee1f996b423d4.

This commit was part of a series adding adding reverse transfers, i.e.
transfers that were created for transfers that were cancelled and
we wanted the item to return back to its sending library. This however
hid the information about transfer happening and we need another approach
to the problem.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Rebased-by: Joonas Kylmälä <joonas.kylmala@helsinki.fi>

JD amended patch: restore Koha::Item::Transfer->from_library (we are
adding tests in a future patch).

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 Koha/Hold.pm                                          |  9 ---------
 Koha/Item/Transfer.pm                                 | 11 ++++-------
 .../intranet-tmpl/prog/en/modules/circ/returns.tt     |  2 --
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/Koha/Hold.pm b/Koha/Hold.pm
index 2bdae269ec..bd5458f494 100644
--- a/Koha/Hold.pm
+++ b/Koha/Hold.pm
@@ -511,17 +511,8 @@ Cancel a hold:
 
 sub cancel {
     my ( $self, $params ) = @_;
-
     $self->_result->result_source->schema->txn_do(
         sub {
-            if ( $self->is_in_transit ) {
-                my $transfer = $self->item->get_transfer;
-                # NOTE: Transfers are well bound with Holds.. as such we have to check that there is actually a
-                # transfer enqueued and in transit here prior to trying to cancel it.
-                if ( $transfer && $transfer->in_transit ) {
-                    $transfer->cancel({ reason => 'CancelReserve', force => 1 });
-                }
-            }
             $self->cancellationdate( dt_from_string->strftime( '%Y-%m-%d %H:%M:%S' ) );
             $self->priority(0);
             $self->cancellation_reason( $params->{cancellation_reason} );
diff --git a/Koha/Item/Transfer.pm b/Koha/Item/Transfer.pm
index 59387d4415..3fee987ae8 100644
--- a/Koha/Item/Transfer.pm
+++ b/Koha/Item/Transfer.pm
@@ -173,15 +173,12 @@ sub cancel {
       ->store;
 
     # Set up return transfer if transfer was force cancelled whilst in transit
-    # and we were not notified that the transfer is being replaced.
     # NOTE: We don't catch here, as we're happy to fail if there are already
     # other transfers in the queue.
-    if ($in_transit && !$params->{replace}) {
-        try {
-            $self->item->request_transfer(
-                { to => $self->from_library, reason => 'TransferCancellation' } );
-        };
-    }
+    try {
+        $self->item->request_transfer(
+            { to => $self->from_library, reason => 'TransferCancellation' } );
+    };
 
     return $self;
 }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index 2108bda509..6a993abbb7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -134,8 +134,6 @@
                                              [%- CASE 'Reserve' -%]Reserve
                                              [%- CASE 'LostReserve' -%]Lost reserve
                                              [%- CASE 'CancelReserve' -%]Cancelled reserve
-                                             [%- CASE 'TransferCancellation' -%]Transfer was cancelled whilst in transit
-                                             [%- CASE -%][% trigger | html %]
                                          [%- END -%]
                                      </p>
                                  </div>
-- 
2.39.5