From 79d44ee40b0d967c05036ffed4fe0c1869421d83 Mon Sep 17 00:00:00 2001 From: Alex Sassmannshausen Date: Mon, 31 Jul 2017 18:34:13 +0200 Subject: [PATCH] Bug 7317: Fix _limit_counter. * Koha/Illrequest.pm (_limit_counter): Update SQL logic. --- Koha/Illrequest.pm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Koha/Illrequest.pm b/Koha/Illrequest.pm index 50906b89fa..526172d52b 100644 --- a/Koha/Illrequest.pm +++ b/Koha/Illrequest.pm @@ -728,18 +728,21 @@ sub _limit_counter { my ( $self, $method, $target ) = @_; # Establish parameters of counts - my $where; + my $resultset; if ($method && $method eq 'annual') { - $where = \"YEAR(placement_date) = YEAR(NOW())"; + $resultset = Koha::Illrequests->search({ + -and => [ + %{$target}, + \"YEAR(placed) = YEAR(NOW())" + ] + }); } else { # assume 'active' # FIXME: This status list is ugly. There should be a method in config # to return these. $where = { status => { -not_in => [ 'QUEUED', 'COMP' ] } }; + $resultset = Koha::Illrequests->search({ %{$target}, %{$where} }); } - # Create resultset - my $resultset = Koha::Illrequests->search({ %{$target}, %{$where} }); - # Fetch counts return $resultset->count; } -- 2.11.0