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>

diff --git a/C4/Accounts.pm b/C4/Accounts.pm
index 3fdf2d7..39b2bda 100644 (file)
--- a/C4/Accounts.pm
+++ b/C4/Accounts.pm
@@ -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;

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 7ab1db7..e51bc33 100644 (file)
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -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,

diff --git a/C4/Reserves.pm b/C4/Reserves.pm
index de7e3f0..09d3628 100644 (file)
--- a/C4/Reserves.pm
+++ b/C4/Reserves.pm
@@ -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,

diff --git a/Koha/Hold.pm b/Koha/Hold.pm
index 3b3aba8..37c7fa1 100644 (file)
--- a/Koha/Hold.pm
+++ b/Koha/Hold.pm
@@ -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

diff --git a/Koha/Patron.pm b/Koha/Patron.pm
index bc7c811..cc1892b 100644 (file)
--- a/Koha/Patron.pm
+++ b/Koha/Patron.pm
@@ -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'
             }