Attachment 122552 Details for Bug 27946 – Bug 27946: (follow-up) Use bug 28656

[patch] Bug 27946: (follow-up) Use bug 28656

Bug-27946-follow-up-Use-bug-28656.patch (text/plain), 2.16 KB, created by Martin Renvoize (ashimema) on 2021-07-02 15:22:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2021-07-02 15:22:44 UTC

Size: 2.16 KB

patch

obsolete

>From 7f81660dd3ac31533fc1da7b33c778d958c4522e Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Fri, 2 Jul 2021 16:22:05 +0100
>Subject: [PATCH] Bug 27946: (follow-up) Use bug 28656
>
>---
> Koha/ArticleRequest.pm | 39 ++++++++++-----------------------------
> 1 file changed, 10 insertions(+), 29 deletions(-)
>
>diff --git a/Koha/ArticleRequest.pm b/Koha/ArticleRequest.pm
>index 310065387c..c014f9acac 100644
>--- a/Koha/ArticleRequest.pm
>+++ b/Koha/ArticleRequest.pm
>@@ -105,35 +105,16 @@ sub cancel {
>     $self->notes($notes) if $notes;
>     if ( $self->debit_line_id ) {
>         my $line = Koha::Account::Lines->find( $self->debit_line_id );
>-        if ( $line->amount != $line->amountoutstanding ) {
>-            $self->borrower->account->add_credit(
>-                {
>-                    amount  => $line->amount,
>-                    user_id => C4::Context->userenv
>-                    ? C4::Context->userenv->{'number'}
>-                    : undef,
>-                    interface  => C4::Context->interface,
>-                    library_id => C4::Context->userenv
>-                    ? C4::Context->userenv->{'branch'}
>-                    : undef,
>-                    type        => 'CREDIT',
>-                    description => 'Article request cancelled',
>-                    item_id     => $self->itemnumber
>-                }
>-            );
>-        }
>-        else {
>-            $line->cancel(
>-                {
>-                    branch => C4::Context->userenv
>-                    ? C4::Context->userenv->{'branch'}
>-                    : undef,
>-                    staff_id => C4::Context->userenv
>-                    ? C4::Context->userenv->{'number'}
>-                    : undef,
>-                }
>-            ) unless $line->status && $line->status eq 'CANCELLED';
>-        }
>+        $line->cancel(
>+            {
>+                  branch => C4::Context->userenv
>+                ? C4::Context->userenv->{'branch'}
>+                : undef,
>+                staff_id => C4::Context->userenv
>+                ? C4::Context->userenv->{'number'}
>+                : undef,
>+            }
>+        );
>     }
> 
>     $self->store();
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 27946: 120144 | 120145 | 120146 | 120147 | 122522 | 122529 | 122530 | 122531 | 122532 | 122552 | 123503 | 123504 | 123505 | 123506 | 123507 | 128660 | 128661 | 128662 | 128663 | 128664 | 128665 | 128868 | 128869 | 128870 | 128871 | 128872 | 128873 | 129141 | 129142 | 129143 | 129144 | 129145 | 129146 | 129147 | 129171 | 129172 | 129173 | 129174 | 129175 | 129176 | 129177