From b104046d89ee6457946b998d9221b1d3771b5d5c Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 1 Nov 2018 12:42:31 +0000 Subject: [PATCH] Bug 21720: Use Koha::Account->add_debit in AddIssuingCharge Known Side Effect: Prior to this patch issuing 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 Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens --- C4/Circulation.pm | 39 +++++++++++---------------------------- 1 file changed, 11 insertions(+), 28 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 5d059a890d..9291cb7a60 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -3219,36 +3219,19 @@ sub AddIssuingCharge { # FIXME What if checkout does not exist? - my $nextaccntno = C4::Accounts::getnextacctno( $checkout->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; - - my $accountline = Koha::Account::Line->new( + my $account = Koha::Account->new({ patron_id => $checkout->borrowernumber }); + my $accountline = $account->add_debit( { - borrowernumber => $checkout->borrowernumber, - itemnumber => $checkout->itemnumber, - issue_id => $checkout->issue_id, - accountno => $nextaccntno, - amount => $charge, - amountoutstanding => $charge, - manager_id => $manager_id, - branchcode => $branchcode, - description => 'Rental', - accounttype => 'Rent', - date => \'NOW()', + amount => $charge, + description => 'Rental', + note => undef, + user_id => C4::Context->userenv ? C4::Context->userenv->{'number'} : 0, + library_id => C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef, + type => 'rent', + item_id => $checkout->itemnumber, + issue_id => $checkout->issue_id, } - )->store(); - - Koha::Account::Offset->new( - { - debit_id => $accountline->id, - type => 'Rental Fee', - amount => $charge, - } - )->store(); + ); } =head2 GetTransfers -- 2.39.5