Attachment 122041 Details for Bug 24190 – Bug 24190: (follow-up) Cancel order del item bug

[patch] Bug 24190: (follow-up) Cancel order del item bug

Bug-24190-follow-up-Cancel-order-del-item-bug.patch (text/plain), 1.31 KB, created by Andrew Isherwood on 2021-06-16 13:29:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Isherwood

Created: 2021-06-16 13:29:36 UTC

Size: 1.31 KB

patch

obsolete

>From b2bc658c47d302a3b4bf46c3ae02649fb696e08c 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

Actions: View | Diff | Splinter Review

Attachments on bug 24190: 96364 | 96369 | 100243 | 105082 | 105083 | 106096 | 106097 | 106098 | 106099 | 111080 | 111081 | 111082 | 111083 | 111084 | 112509 | 112510 | 112511 | 112512 | 112513 | 112514 | 116148 | 116149 | 116150 | 116151 | 116152 | 116153 | 122040 | 122041 | 122042 | 122043 | 122044 | 122045 | 123385 | 123386 | 123387 | 123388 | 123389 | 123390 | 123391 | 125119