From 87cbd07be836291f860ecbd5cea5538863317164 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sat, 17 Oct 2020 22:47:49 +0000 Subject: [PATCH] Bug 26190: Allow to close a basket with only cancelled order lines MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit At the moment there are several cases, when closing a basket is not possible: - when there are no order lines in it - when there are order lines with uncertain prices - when the basket is marked as a standing order The first case wasn't checked correctly as only pending/received orders would be counted, but not cancelled orders. To test: - Create a basket - Create an order line - Verify the "close this basket" button shows - Cancel the order line - the button disappears - Apply the patch - Verify the button appears and works now - Create another basket - make sure you cannot close it without order lines - Create an order line with uncertain price checked - you cannot close it - Resolve the uncertain price - you can now close the basket. Signed-off-by: Séverine QUEUNE Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart (cherry picked from commit 2d6595a1bf0e04611c2a1d5c18489c6ee799a9aa) Signed-off-by: Lucas Gass --- acqui/basket.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acqui/basket.pl b/acqui/basket.pl index bfe06ea158..c4d773c100 100755 --- a/acqui/basket.pl +++ b/acqui/basket.pl @@ -424,7 +424,7 @@ if ( $op eq 'list' ) { # # (The template has another implicit restriction that the order cannot be closed if there # are any orders with uncertain prices.) - unclosable => @orders ? $basket->{is_standing} : 1, + unclosable => @orders || @cancelledorders ? $basket->{is_standing} : 1, has_budgets => $has_budgets, duplinbatch => $duplinbatch, csv_profiles => [ Koha::CsvProfiles->search({ type => 'sql', used_for => 'export_basket' }) ], -- 2.39.5