Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 21721: Use Koha::Account->add_debit in AddRenewal

Browse source 
Known Side Effect: Prior to this patch renewal charges were not
recorded in the FinesLog. After this patch, if the FinesLog is
enabled then the 'action' will be recorded as `create_rent`.

Sponsored-by: PTFS Europe

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
This commit is contained in:
Martin Renvoize 2018-11-01 13:28:25 +00:00 committed by Nick Clemens
parent fcd6bdc5b8
commit 178af5ab27
1 changed files with 6 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
C4/Circulation.pm
View file

@ -1433,7 +1433,8 @@ sub AddIssue {
# If it costs to borrow this book, charge it to the patron's account.
my ( $charge, $itemtype ) = GetIssuingCharges( $item->itemnumber, $borrower->{'borrowernumber'} );
if ( $charge > 0 ) {
AddIssuingCharge( $issue, $charge );
my $description = "Rental";
AddIssuingCharge( $issue, $charge, $description );
}
# Record the fact that this book was issued.
@ -2861,26 +2862,8 @@ sub AddRenewal {
# Charge a new rental fee, if applicable?
my ( $charge, $type ) = GetIssuingCharges( $itemnumber, $borrowernumber );
if ( $charge > 0 ) {
my $accountno = C4::Accounts::getnextacctno( $borrowernumber );
my $manager_id = 0;
$manager_id = C4::Context->userenv->{'number'} if C4::Context->userenv;
my $branchcode = C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef;
Koha::Account::Line->new(
{
date => dt_from_string(),
borrowernumber => $borrowernumber,
accountno => $accountno,
amount => $charge,
manager_id => $manager_id,
accounttype => 'Rent',
amountoutstanding => $charge,
itemnumber => $itemnumber,
branchcode => $branchcode,
description => 'Renewal of Rental Item '
. $biblio->title
. " " . $item->barcode,
}
)->store();
my $description = "Renewal of Rental Item " . $biblio->title . " " .$item->barcode;
AddIssuingCharge($issue, $charge, $description);
}
# Send a renewal slip according to checkout alert preferencei
@ -3205,7 +3188,7 @@ sub _get_discount_from_rule {
=cut
sub AddIssuingCharge {
my ( $checkout, $charge ) = @_;
my ( $checkout, $charge, $description ) = @_;
# FIXME What if checkout does not exist?
@ -3213,7 +3196,7 @@ sub AddIssuingCharge {
my $accountline = $account->add_debit(
{
amount => $charge,
description => 'Rental',
description => $description,
note => undef,
user_id => C4::Context->userenv ? C4::Context->userenv->{'number'} : 0,
library_id => C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef,