From fe8d1a7af336ae215295bdff5d8aedff76d1a679 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Tue, 18 Feb 2020 16:13:11 +0100
Subject: [PATCH] Bug 23384: Fix use statement order for ArticleRequest::Status

Koha::ArticleRequest is used by Koha::ArticleRequests so
Koha::ArticleRequest::Status should not be needed in
Koha::ArticleRequest.
Also Koha::ArticleRequest::Status must be loaded before
Koha::ArticleRequest

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 Koha/ArticleRequest.pm  | 1 -
 Koha/ArticleRequests.pm | 2 +-
 Koha/Patron.pm          | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Koha/ArticleRequest.pm b/Koha/ArticleRequest.pm
index 39f68b1711..2c47dd03fe 100644
--- a/Koha/ArticleRequest.pm
+++ b/Koha/ArticleRequest.pm
@@ -26,7 +26,6 @@ use Koha::Patrons;
 use Koha::Biblios;
 use Koha::Items;
 use Koha::Libraries;
-use Koha::ArticleRequest::Status;
 use Koha::DateUtils qw(dt_from_string);
 
 use base qw(Koha::Object);
diff --git a/Koha/ArticleRequests.pm b/Koha/ArticleRequests.pm
index 701c1abcfc..9b27615573 100644
--- a/Koha/ArticleRequests.pm
+++ b/Koha/ArticleRequests.pm
@@ -23,8 +23,8 @@ use Carp;
 
 use Koha::Database;
 
-use Koha::ArticleRequest;
 use Koha::ArticleRequest::Status;
+use Koha::ArticleRequest;
 
 use base qw(Koha::Objects);
 
diff --git a/Koha/Patron.pm b/Koha/Patron.pm
index e6d7538640..0bdd39cdd3 100644
--- a/Koha/Patron.pm
+++ b/Koha/Patron.pm
@@ -28,6 +28,7 @@ use Unicode::Normalize;
 use C4::Context;
 use C4::Log;
 use Koha::Account;
+use Koha::ArticleRequests;
 use Koha::AuthUtils;
 use Koha::Checkouts;
 use Koha::Club::Enrollments;
-- 
2.11.0