From 7d068a1021c5594dba93c0f20afa93d9f635c160 Mon Sep 17 00:00:00 2001
From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com>
Date: Tue, 19 May 2020 12:06:47 +0100
Subject: [PATCH] Bug 24190: (follow-up) Cancel order del item bug

If an order is cancelled but the associated bib / items are unable to be
removed, we go into error handling. We still need to log the
cancellation though. So this fix moves the logging to just after the
cancellation, so it will be logged regardless of the outcome with
associated things.

Signed-off-by: Maura Stephens <maura.stephens@gmit.ie>
---
 acqui/cancelorder.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/acqui/cancelorder.pl b/acqui/cancelorder.pl
index 4087fec9b9..7bc7d32364 100755
--- a/acqui/cancelorder.pl
+++ b/acqui/cancelorder.pl
@@ -67,11 +67,11 @@ if( $action and $action eq "confirmcancel" ) {
         $template->param( error_delbiblio => 1 )
             if $messages[0]->message eq 'error_delbiblio';
     } else {
-        $template->param(success_cancelorder => 1);
         # Log the cancellation of the order
         if (C4::Context->preference("AcqLog")) {
             logaction('ACQUISITIONS', 'CANCEL_ORDER', $ordernumber);
         }
+        $template->param(success_cancelorder => 1);
     }
     $template->param(confirmcancel => 1);
 }
-- 
2.20.1