Bug 18501: (follow-up) Do not rely on userenv->{branchcode}

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

diff --git a/Koha/CirculationRules.pm b/Koha/CirculationRules.pm
index 9bf1ab8..87062f5 100644 (file)
--- a/Koha/CirculationRules.pm
+++ b/Koha/CirculationRules.pm
@@ -439,8 +439,8 @@ sub get_lostreturn_policy {
 
     my $behaviour = C4::Context->preference( 'RefundLostOnReturnControl' ) // 'CheckinLibrary';
     my $behaviour_mapping = {
-           CheckinLibrary => $params->{'return_branch'},
-           ItemHomeBranch => $item->homebranch,
+        CheckinLibrary    => $params->{'return_branch'} // $item->homebranch,
+        ItemHomeBranch    => $item->homebranch,
         ItemHoldingBranch => $item->holdingbranch
     };
 

diff --git a/Koha/Item.pm b/Koha/Item.pm
index 84ba2da..8dffac4 100644 (file)
--- a/Koha/Item.pm
+++ b/Koha/Item.pm
@@ -811,8 +811,10 @@ sub _set_found_trigger {
     return $self
       unless Koha::CirculationRules->get_lostreturn_policy(
         {
-            current_branch => C4::Context->userenv->{branch},
-            item           => $self,
+            item          => $self,
+            return_branch => C4::Context->userenv
+            ? C4::Context->userenv->{'branch'}
+            : undef,
         }
       );