Attachment 85326 Details for Bug 21756 – Bug 21756: (QA follow-up) Fixes for rebase

[patch] Bug 21756: (QA follow-up) Fixes for rebase

Bug-21756-QA-follow-up-Fixes-for-rebase.patch (text/plain), 1.99 KB, created by Martin Renvoize (ashimema) on 2019-02-20 11:29:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2019-02-20 11:29:57 UTC

Size: 1.99 KB

patch

obsolete

>From f1edd59a3b17b7052a58dd9f1bfd69f3144a80a5 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Wed, 20 Feb 2019 10:51:21 +0000
>Subject: [PATCH] Bug 21756: (QA follow-up) Fixes for rebase
>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> members/maninvoice.pl | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/members/maninvoice.pl b/members/maninvoice.pl
>index d5e24497ff..52a8791d9d 100755
>--- a/members/maninvoice.pl
>+++ b/members/maninvoice.pl
>@@ -80,9 +80,9 @@ if ($add){
>         my $amount=$input->param('amount');
>         my $type=$input->param('type');
>         my $note    = $input->param('note');
>+        my $account = $patron->account;
>         try {
>-            my $account = $patron->account;
>-            my $invoice = $account->add_debit(
>+            $account->add_debit(
>                 {
>                     amount      => $amount,
>                     item_id     => $itemnum,
>@@ -93,17 +93,17 @@ if ($add){
>             );
> 
>             if ( C4::Context->preference('AccountAutoReconcile') ) {
>-                $patron->account->reconcile_balance;
>+                $account->reconcile_balance;
>             }
>         }
>         catch {
>-            if ( $_->isa('Koha::Exceptions::Object::FKConstraint') $error =~ /FOREIGN KEY/ && $error =~ /itemnumber/ ) {
>+            if ( $_->isa('Koha::Exceptions::Object::FKConstraint') && $_->error =~ /FOREIGN KEY/ && $_->error =~ /itemnumber/ ) {
>                 $template->param( 'ITEMNUMBER' => 1 ) if ($_->broken_fk eq 'itemnumber');
>                 $template->param( 'ERROR' => $_->message );
>             }
>             $template->param( csrf_token => Koha::Token->new->generate_csrf({ session_id => scalar $input->cookie('CGISESSID') }) );
>             output_html_with_http_headers $input, $cookie, $template->output;
>-        };
>+        }
> 
>         print $input->redirect("/cgi-bin/koha/members/boraccount.pl?borrowernumber=$borrowernumber");
>         exit;
>-- 
>2.20.1

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