Attachment 112107 Details for Bug 26190 – Bug 26190: Allow to close a basket with only cancelled order lines

[patch] Bug 26190: Allow to close a basket with only cancelled order lines

Bug-26190-Allow-to-close-a-basket-with-only-cancel.patch (text/plain), 1.95 KB, created by Martin Renvoize (ashimema) on 2020-10-21 15:24:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2020-10-21 15:24:54 UTC

Size: 1.95 KB

patch

obsolete

>From 52d28a057e1c3f79713a7baf309ca42dad15dce2 Mon Sep 17 00:00:00 2001
>From: Katrin Fischer <katrin.fischer.83@web.de>
>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=UTF-8
>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 <severine.queune@bulac.fr>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> acqui/basket.pl | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/acqui/basket.pl b/acqui/basket.pl
>index d0fa4f2eb7..ae918b93d3 100755
>--- a/acqui/basket.pl
>+++ b/acqui/basket.pl
>@@ -423,7 +423,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.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 26190: 111946 | 111990 | 112107