gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 22593: Fix bad ternaries after bug 22008 

A series of ternaries were introduced when we moved to add_debit which
defaulted to 'user 0' should a userenv not be set.  This was incorrect
as userenv may well not be set (during cronscript runs for example) and
the new constraint would not allow such a default. We switch to 'undef'
here to satisfy the constraint.

Test plan
1) Ensure you have data in your system that would be caught by the
longoverdues cronjob.
2) Ensure you're sysprefs are setup to charge for lost items
3) Run the script and varify it runs to completion without errors

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

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

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
This commit is contained in:
Martin Renvoize 2019-03-27 13:55:05 +00:00 committed by Nick Clemens
parent 3c69e084d7
commit d522d80c5c
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
C4/Accounts.pm
View File

@ -106,7 +106,7 @@ sub chargelostitem{
amount => $processfee,
description => $description,
note => $processingfeenote,
user_id => C4::Context->userenv ? C4::Context->userenv->{'number'} : 0,
user_id => C4::Context->userenv ? C4::Context->userenv->{'number'} : undef,
library_id => C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef,
type => 'processing',
item_id => $itemnumber,
@ -121,7 +121,7 @@ sub chargelostitem{
amount => $replacementprice,
description => $description,
note => undef,
user_id => C4::Context->userenv ? C4::Context->userenv->{'number'} : 0,
user_id => C4::Context->userenv ? C4::Context->userenv->{'number'} : undef,
library_id => C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef,
type => 'lost_item',
item_id => $itemnumber,
@ -146,8 +146,7 @@ sub manualinvoice {
deprecated "C4::Accounts::manualinvoice is deprecated in favor of Koha::Account->add_debit";
my $manager_id = 0;
$manager_id = C4::Context->userenv->{'number'} if C4::Context->userenv;
my $manager_id = C4::Context->userenv ? C4::Context->userenv->{'number'} : undef;
my $dbh = C4::Context->dbh;
my $insert;
my $amountleft = $amount;

2
C4/Circulation.pm
View File

@ -3221,7 +3221,7 @@ sub AddIssuingCharge {
amount => $charge,
description => $description,
note => undef,
user_id => C4::Context->userenv ? C4::Context->userenv->{'number'} : 0,
user_id => C4::Context->userenv ? C4::Context->userenv->{'number'} : undef,
library_id => C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef,
type => 'rent',
item_id => $checkout->itemnumber,

2
C4/Reserves.pm
View File

@ -573,7 +573,7 @@ sub ChargeReserveFee {
amount => $fee,
description => "Reserve Charge - " . $title,
note => undef,
user_id => C4::Context->userenv ? C4::Context->userenv->{'number'} : 0,
user_id => C4::Context->userenv ? C4::Context->userenv->{'number'} : undef,
library_id => C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef,
sip => undef,
invoice_type => undef,

2
Koha/Hold.pm
View File

@ -370,7 +370,7 @@ sub cancel {
$account->add_debit(
{
amount => $charge,
user_id => C4::Context->userenv ? C4::Context->userenv->{'number'} : 0,
user_id => C4::Context->userenv ? C4::Context->userenv->{'number'} : undef,
library_id => C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef,
type => 'hold_expired',
item_id => $self->itemnumber

2
Koha/Patron.pm
View File

@ -850,7 +850,7 @@ sub add_enrolment_fee_if_needed {
$self->account->add_debit(
{
amount => $enrolment_fee,
user_id => C4::Context->userenv ? C4::Context->userenv->{'number'} : 0,
user_id => C4::Context->userenv ? C4::Context->userenv->{'number'} : undef,
library_id => C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef,
type => 'account'
}