From 7b75849412d8e3465ca5e734869c74d5aa3241c1 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Thu, 31 Jan 2019 14:56:54 +0000
Subject: [PATCH] Bug 20912: (QA follow-up) Fix some test failures

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 C4/Circulation.pm                  |  6 ++----
 t/db_dependent/Circulation/issue.t | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 0fa6ea7390..7d04d3f97f 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -2872,8 +2872,7 @@ sub AddRenewal {
     my $patron = Koha::Patrons->find( $borrowernumber ) or return; # FIXME Should do more than just return
     my $patron_unblessed = $patron->unblessed;
 
-    my $library = Koha::Libraries->find( $branch );
-
+    my $circ_library = Koha::Libraries->find( _GetCircControlBranch($item, $patron_unblessed) );
 
     if ( C4::Context->preference('CalculateFinesOnReturn') && $issue->is_overdue ) {
         _CalculateAndUpdateFine( { issue => $issue, item => $item_unblessed, borrower => $patron_unblessed } );
@@ -2892,11 +2891,10 @@ sub AddRenewal {
         $datedue =  CalcDateDue($datedue, $itemtype, _GetCircControlBranch($item_unblessed, $patron_unblessed), $patron_unblessed, 'is a renewal');
     }
 
-
     my $fees = Koha::Charges::Fees->new(
         {
             patron    => $patron,
-            library   => $library,
+            library   => $circ_library,
             item      => $item_object,
             to_date   => dt_from_string( $datedue ),
         }
diff --git a/t/db_dependent/Circulation/issue.t b/t/db_dependent/Circulation/issue.t
index ede30003e7..c748eaab6a 100644
--- a/t/db_dependent/Circulation/issue.t
+++ b/t/db_dependent/Circulation/issue.t
@@ -85,6 +85,22 @@ my $categorycode = $builder->build({
         value => { enrolmentfee => undef }
     })->{categorycode};
 
+# A default issuingrule should always be present
+my $issuingrule = $builder->build(
+    {
+        source => 'Issuingrule',
+        value  => {
+            itemtype      => '*',
+            categorycode  => '*',
+            branchcode    => '*',
+            lengthunit    => 'days',
+            issuelength   => 0,
+            renewalperiod => 0,
+            renewalsallowed => 0
+        }
+    }
+);
+
 # Add Dates
 my $dt_today = dt_from_string;
 my $today    = output_pref(
-- 
2.39.5