Attachment 83258 Details for Bug 21756 – Bug 21756: Remove use of manualinvoice from Koha::Patron

[patch] Bug 21756: Remove use of manualinvoice from Koha::Patron

Bug-21756-Remove-use-of-manualinvoice-from-KohaPat.patch (text/plain), 1.86 KB, created by Martin Renvoize (ashimema) on 2018-12-17 08:58:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2018-12-17 08:58:24 UTC

Size: 1.86 KB

patch

obsolete

>From 49e3422906dba68151fb060771bcf41ef3fa5953 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Sat, 15 Dec 2018 16:16:33 +0000
>Subject: [PATCH] Bug 21756: Remove use of manualinvoice from Koha::Patron
>
>Known Side Effect: Prior to this patch hold cancellation fees
>were not recorded in the FinesLog. After this patch, if the
>FinesLog is enabled then the 'action' will be recorded as
>`create_hold_expiration`.
>---
> Koha/Hold.pm | 14 ++++++++++++--
> 1 file changed, 12 insertions(+), 2 deletions(-)
>
>diff --git a/Koha/Hold.pm b/Koha/Hold.pm
>index 23d5d447a5..f8975feb7f 100644
>--- a/Koha/Hold.pm
>+++ b/Koha/Hold.pm
>@@ -351,7 +351,17 @@ sub cancel {
>             # and, if desired, charge a cancel fee
>             my $charge = C4::Context->preference("ExpireReservesMaxPickUpDelayCharge");
>             if ( $charge && $params->{'charge_cancel_fee'} ) {
>-                C4::Accounts::manualinvoice($self->borrowernumber, $self->itemnumber, '', 'HE', $charge);
>+                my $account =
>+                  Koha::Account->new( { patron_id => $self->borrowernumber } );
>+                $account->add_debit(
>+                    {
>+                        amount  => $charge,
>+                        user_id => C4::Context->userenv ? C4::Context->userenv->{'number'} : 0,
>+                        library_id => C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef,
>+                        type    => 'hold_expired',
>+                        item_id => $self->itemnumber
>+                    }
>+                );
>             }
> 
>             C4::Log::logaction( 'HOLDS', 'CANCEL', $self->reserve_id, Dumper($self->unblessed) )
>@@ -386,8 +396,8 @@ sub _type {
> =head1 AUTHORS
> 
> Kyle M Hall <kyle@bywatersolutions.com>
>-
> Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>+Martin Renvoize <martin.renvoize@ptfs-europe.com>
> 
> =cut
> 
>-- 
>2.19.2

Actions: View | Diff | Splinter Review

Attachments on bug 21756: 83257 | 83258 | 83259 | 83260 | 83261 | 83262 | 83263 | 83264 | 83265 | 83266 | 83267 | 83268 | 83269 | 83270 | 83271 | 84729 | 84730 | 84731 | 84732 | 84733 | 85320 | 85321 | 85322 | 85323 | 85324 | 85325 | 85326 | 85327 | 85350 | 85420 | 85421 | 85422 | 85423 | 85424 | 85425 | 85426 | 85427 | 85428 | 85429 | 85430 | 85505 | 85506 | 85507 | 85508 | 85509 | 85510 | 85511 | 85512 | 85513 | 85514 | 85515 | 85638 | 85639 | 85640 | 85641 | 85642 | 85643 | 85644 | 85645 | 85646 | 85647 | 85648 | 85654 | 85655 | 85656 | 85657 | 85658 | 85659 | 85660 | 85661 | 85662 | 85663 | 85664 | 85665 | 86265 | 86266 | 86267 | 86268 | 86269 | 86270 | 86271 | 86272 | 86273 | 86274 | 86275 | 86276 | 86441 | 86442 | 86443 | 86444 | 86445 | 86446 | 86447 | 86448 | 86449 | 86450 | 86451 | 86452