@@ -, +, @@ --- C4/Accounts.pm | 7 +++---- C4/Circulation.pm | 2 +- C4/Reserves.pm | 2 +- Koha/Hold.pm | 2 +- Koha/Patron.pm | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) --- a/C4/Accounts.pm +++ a/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; --- a/C4/Circulation.pm +++ a/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, --- a/C4/Reserves.pm +++ a/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, --- a/Koha/Hold.pm +++ a/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 --- a/Koha/Patron.pm +++ a/Koha/Patron.pm @@ -849,7 +849,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' } --