Attachment 82396 Details for Bug 20598 – Bug 20598: (QA follow-up) Tiny fixes

[patch] Bug 20598: (QA follow-up) Tiny fixes

Bug-20598-QA-follow-up-Tiny-fixes.patch (text/plain), 1.89 KB, created by Marcel de Rooy on 2018-11-16 10:50:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2018-11-16 10:50:41 UTC

Size: 1.89 KB

patch

obsolete

>From f7e983b43f768641c1a7e64f233b38e416796bcb Mon Sep 17 00:00:00 2001
>From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Date: Fri, 16 Nov 2018 10:37:55 +0100
>Subject: [PATCH] Bug 20598: (QA follow-up) Tiny fixes
>Content-Type: text/plain; charset=utf-8
>
>[1] Correct POD for _FixOverduesOnReturn
>Is called by AddReturn, AddRenewal and LostItem.
>Also tested in Circulation.t btw
>
>[2] $dbh is not used in _FixOverduesOnReturn
>[3] Moving all parameters to the first line.
>[4] Variable $uquery is not used too.
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> C4/Circulation.pm | 11 ++++-------
> 1 file changed, 4 insertions(+), 7 deletions(-)
>
>diff --git a/C4/Circulation.pm b/C4/Circulation.pm
>index ba4f63e..0999a97 100644
>--- a/C4/Circulation.pm
>+++ b/C4/Circulation.pm
>@@ -2299,22 +2299,20 @@ C<$itm> itemnumber
> C<$exemptfine> BOOL -- remove overdue charge associated with this issue. 
> C<$dropboxmode> BOOL -- remove lastincrement on overdue charge associated with this issue.
> 
>-Internal function, called only by AddReturn
>+Internal function
> 
> =cut
> 
> sub _FixOverduesOnReturn {
>-    my ($borrowernumber, $item);
>-    unless ($borrowernumber = shift) {
>+    my ($borrowernumber, $item, $exemptfine, $dropbox ) = @_;
>+    unless( $borrowernumber ) {
>         warn "_FixOverduesOnReturn() not supplied valid borrowernumber";
>         return;
>     }
>-    unless ($item = shift) {
>+    unless( $item ) {
>         warn "_FixOverduesOnReturn() not supplied valid itemnumber";
>         return;
>     }
>-    my ($exemptfine, $dropbox) = @_;
>-    my $dbh = C4::Context->dbh;
> 
>     # check for overdue fine
>     my $accountline = Koha::Account::Lines->search(
>@@ -2329,7 +2327,6 @@ sub _FixOverduesOnReturn {
>     )->next();
>     return 0 unless $accountline;    # no warning, there's just nothing to fix
> 
>-    my $uquery;
>     if ($exemptfine) {
>         my $amountoutstanding = $accountline->amountoutstanding;
> 
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 20598: 74377 | 75932 | 81953 | 81954 | 82391 | 82392 | 82394 | 82395 | 82396