Bug 22417: Fix borrowernumber values

[srvgit] / circ / returns.pl

diff --git a/circ/returns.pl b/circ/returns.pl
index 58a5e84..7a45995 100755 (executable)
--- a/circ/returns.pl
+++ b/circ/returns.pl
@@ -295,17 +295,18 @@ if ($barcode) {
     my $return_date = $dropboxmode ? $dropboxdate : $return_date_override_dt;
 
     # Block return if multi-part and confirm has not been received
-    my $needs_confirm = 0;
-    if ( C4::Context->preference("CircConfirmItemParts") ) {
-        if ( $item->materials && !$query->param('multiple_confirm') ) {
-                $needs_confirm = 1;
-        }
-    }
+    my $needs_confirm =
+         C4::Context->preference("CircConfirmItemParts")
+      && $item
+      && $item->materials
+      && !$query->param('multiple_confirm');
+    $template->param( 'multiple_confirmed' => 1 )
+      if $query->param('multiple_confirm');
 
     # do the return
     ( $returned, $messages, $issue, $borrower ) =
       AddReturn( $barcode, $userenv_branch, $exemptfine, $return_date )
-      unless $needs_confirm;
+          unless $needs_confirm;
 
     if ($returned) {
         my $time_now = dt_from_string()->truncate( to => 'minute');