From 23e7f7995e4427ffa05dd4cba50e72776e426764 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>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 acqui/cancelorder.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/acqui/cancelorder.pl b/acqui/cancelorder.pl
index 6278202471..a0df47a866 100755
--- a/acqui/cancelorder.pl
+++ b/acqui/cancelorder.pl
@@ -65,11 +65,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.39.2