gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 33653: Never consider received orders as late 

We should not list received orders on the late orders page.

Test plan:
* Create a basket
* Create a normal order (not from a subscription, no standing order)
* Leave estimated delivery date empty
* Close the basket
* Create a new invoice and receive the order line
* Go to acq > late orders
* Verify the order is not in the list
* Set filter for 'To' date into the future, i.e. 01/01/2025
=> Without this patch the order shows up
=> With this patch applied the received order does not show up

Signed-off-by: Michaela Sieber <michaela.sieber@kit.edu>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 64c4f115cd)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
This commit is contained in:
Jonathan Druart 2023-05-03 15:18:13 +02:00 committed by Matt Blenkinsop
parent 59a1e4b9fb
commit c48087b551
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Koha/Acquisition/Orders.pm
View File

@ -132,7 +132,7 @@ sub filter_by_lates {
: ()
),
( orderstatus => { '!=' => 'cancelled' } ),
( orderstatus => { '-not_in' => ['cancelled', 'complete'] } ),
},
{

16
t/db_dependent/Koha/Acquisition/Order.t
View File

@ -416,6 +416,7 @@ subtest 'filter_by_late' => sub {
datereceived => undef,
datecancellationprinted => undef,
estimated_delivery_date => undef,
orderstatus => 'ordered',
}
}
);
@ -436,6 +437,7 @@ subtest 'filter_by_late' => sub {
datereceived => undef,
datecancellationprinted => undef,
estimated_delivery_date => undef,
orderstatus => 'ordered',
}
}
);
@ -456,6 +458,7 @@ subtest 'filter_by_late' => sub {
datereceived => undef,
datecancellationprinted => undef,
estimated_delivery_date => undef,
orderstatus => 'ordered',
}
}
);
@ -476,6 +479,19 @@ subtest 'filter_by_late' => sub {
datereceived => undef,
datecancellationprinted => undef,
estimated_delivery_date => undef,
orderstatus => 'ordered',
}
}
);
my $order_42 = $builder->build_object(
{
class => 'Koha::Acquisition::Orders',
value => {
basketno => $basket_4->basketno,
datereceived => undef,
datecancellationprinted => undef,
estimated_delivery_date => undef,
orderstatus => 'complete',
}
}
);