@@ -, +, @@ --- C4/Circulation.pm | 6 ++---- t/db_dependent/Circulation/issue.t | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) --- a/C4/Circulation.pm +++ a/C4/Circulation.pm @@ -2885,8 +2885,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, borrower => $patron_unblessed } ); @@ -2905,11 +2904,10 @@ sub AddRenewal { $datedue = CalcDateDue($datedue, $itemtype, _GetCircControlBranch($item, $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 ), } --- a/t/db_dependent/Circulation/issue.t +++ a/t/db_dependent/Circulation/issue.t @@ -84,6 +84,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( --