From 509bce988511046d0c7c2cb979b7c907c8420249 Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Fri, 23 Sep 2022 10:12:22 +0200 Subject: [PATCH] Bug 31615: Allow checkin of items bundles without verifying their contents This patch adds a button in the "bundle verification" modal to skip this step and do the checkin anyway. Test plan: 1. Create an items bundle (see bug 28854 comment 458) 2. Check out this bundle, then return it. The "bundle verification" modal should appear 3. Leave the textarea empty and click on "Confirm checkin without verifying bundle contents" 4. Confirm that the bundle was correctly returned, and no items were marked as lost --- circ/returns.pl | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/circ/returns.pl b/circ/returns.pl index 4ba8812888..366fd1e2fb 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -415,7 +415,7 @@ if ($barcode) { } # Mark missing bundle items as lost and report unexpected items - if ( $item && $item->is_bundle && $query->param('confirm_items_bundle_return') ) { + if ( $item && $item->is_bundle && $query->param('confirm_items_bundle_return') && !$query->param('do_not_verify_items_bundle_contents') ) { my $BundleLostValue = C4::Context->preference('BundleLostValue'); my $barcodes = $query->param('verify-items-bundle-contents-barcodes'); my @barcodes = map { s/^\s+|\s+$//gr } ( split /\n/, $barcodes ); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index be91ab7be7..ea052bc7dd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -497,6 +497,7 @@ [% END %] [% IF item.onloan %] + [% ELSE %] [% END %] -- 2.30.2