Attachment 93029 Details for Bug 23321 – Bug 23321: (follow-up) Correction to exception logic

[patch] Bug 23321: (follow-up) Correction to exception logic

Bug-23321-follow-up-Correction-to-exception-logic.patch (text/plain), 1.49 KB, created by Tomás Cohen Arazi (tcohen) on 2019-09-20 19:02:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomás Cohen Arazi (tcohen)

Created: 2019-09-20 19:02:25 UTC

Size: 1.49 KB

patch

obsolete

>From c182b726527b684a67615c1ad14137eada946673 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Fri, 13 Sep 2019 17:03:02 +0100
>Subject: [PATCH] Bug 23321: (follow-up) Correction to exception logic
>
>This patch reduces the noisy warning of uninitialised variables
>
>Sponsored-by: PTFS Europe
>Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
>---
> Koha/Account.pm | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
>diff --git a/Koha/Account.pm b/Koha/Account.pm
>index 719ea1da96..63c212bc5b 100644
>--- a/Koha/Account.pm
>+++ b/Koha/Account.pm
>@@ -89,8 +89,9 @@ sub pay {
>     my $interface = $params ? ( $params->{interface} || C4::Context->interface ) : C4::Context->interface;
>     Koha::Exceptions::Account::RegisterRequired->throw()
>       if ( C4::Context->preference("UseCashRegisters")
>-        && !defined($cash_register)
>-        && ( $interface ne 'opac' ) );
>+        && defined($payment_type)
>+        && ( $payment_type eq 'CASH' )
>+        && !defined($cash_register) );
> 
>     my @fines_paid; # List of account lines paid on with this payment
> 
>@@ -352,8 +353,9 @@ sub add_credit {
> 
>     Koha::Exceptions::Account::RegisterRequired->throw()
>       if ( C4::Context->preference("UseCashRegisters")
>-        && !defined($cash_register)
>-        && ( $payment_type eq 'CASH' ) );
>+        && defined($payment_type)
>+        && ( $payment_type eq 'CASH' )
>+        && !defined($cash_register) );
> 
>     my $schema = Koha::Database->new->schema;
> 
>-- 
>2.23.0

Actions: View | Diff | Splinter Review

Attachments on bug 23321: 91596 | 91597 | 91598 | 91599 | 91600 | 91601 | 91602 | 91621 | 92057 | 92058 | 92059 | 92060 | 92061 | 92062 | 92063 | 92064 | 92065 | 92083 | 92084 | 92085 | 92086 | 92087 | 92088 | 92089 | 92090 | 92091 | 92394 | 92395 | 92396 | 92397 | 92398 | 92399 | 92400 | 92401 | 92402 | 92467 | 92468 | 92469 | 92470 | 92471 | 92472 | 92473 | 92474 | 92475 | 92803 | 92804 | 92805 | 92806 | 92807 | 92808 | 92809 | 92810 | 92811 | 92812 | 92813 | 92814 | 92829 | 92879 | 92880 | 92881 | 92882 | 92883 | 92884 | 92885 | 92886 | 92887 | 92888 | 92889 | 93019 | 93020 | 93021 | 93022 | 93023 | 93024 | 93025 | 93026 | 93027 | 93028 | 93029 | 93030 | 93031 | 93032 | 93033 | 93034 | 93035 | 93188